Funktional Scoring!
Merge branch 'master' of https://github.com/TheNextGuy32/FoodFriends

Conflicts:
	src/js/main.js
Revert "Merge branch 'master' of https://github.com/TheNextGuy32/FoodFriends"

This reverts commit 0cead1d94a3942ac2f5bc6c67945f8abc6ee9b8a, reversing
changes made to d551425e935fc605a3cc6728ce405b40d300b1b9.
score optimized
Merge branch 'master' of https://github.com/TheNextGuy32/FoodFriends

Conflicts:
	src/js/main.js
Revert "Merge branch 'master' of https://github.com/TheNextGuy32/FoodFriends"

This reverts commit 7d34ff715c753112086ba222d613e4f9a4c874d0, reversing
changes made to ed2dd1e4d22d0f7c13ba9f22b96a73d4f6609d1b.