fix automerge
Merge branch 'master' of https://github.com/at-kevinlau/TartanHacks_2014