Bad collisions
Merge branch 'master' of https://github.com/TheNextGuy32/FoodFriends

Conflicts:
	src/js/main.js