More stuff
Merge branch 'master' of https://github.com/Card-Fags/Carbs-Alleviate-Hunger

Conflicts:
	CarbsAlleviateHunger/CarbsAlleviateHunger/Controllers/GameController.cs