Minor changes
Merge branch 'master' of github.com:TheNextGuy32/FoodFriends
Merge branch 'master' of github.com:TheNextGuy32/FoodFriends

Conflicts:
	src/index.html
	src/js/main.js