Build file needs to change for emma to work. Tutorial led us off cliff
Merge branch 'master' of https://github.com/blasv/DineOn into mMaster
Merge pull request #282 from mrathjen/mMaster

Build file needs to change for emma to work. Tutorial led us off cliff.