FIXED THE SHIT
Merge branch 'master' of https://github.com/guts2014/where-s-our-food

Conflicts:
	scrollingElements/playnote.js
Merge branch 'master' of https://github.com/guts2014/where-s-our-food
YYYYEEEEAAAAAAHHHHHHHHHHHHHHH