update
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/gui/GameBoard.java
	src/logic/GameManager.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/logic/GameManager.java
	src/logic/agent/Enemy.java
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Now you can change how many enemes you can, and select to control the player or not.
Merge remote-tracking branch 'origin/master'