Merging with master
Merge remote-tracking branch 'origin'
Edited menu.php
Merge branch 'master' of https://github.com/sunheng/HackGT2014
Cleaned up menu and yelp_aggregate