Changed John goes to the hill
Picked original for merge
Changed to down
Merge branch 'master' of https://github.com/ruthst/APT_FALL_14