Gatz project 2016 term 4

Modified