lots of menu design stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/GameController.java
	src/Person.java
	src/Restaurant.java