Slowly adding more player and citizen behavior
Merge branch 'master' of https://github.com/RadioLemon/daniel_loves_brocolli

Conflicts:
	james_loves_brocolli_netbeans/src/bropals/interactable/people/Citizen.java
	james_loves_brocolli_netbeans/src/bropals/interactable/people/Player.java