added json file and main.js to unclutter main.html
Merge branch 'master' of https://github.com/teamawesomesauce/Main
changed some things
Merge branch 'master' of https://github.com/teamawesomesauce/Main

Conflicts:
	FoodCounter/main.html
dd transitions folder
wq
:wq