first commit
test
Merge branch 'master' of https://github.com/mgoldber/FoodHack2014
Adding files for base template