Q3
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/epdebs/game_objects/Game.class
	bin/epdebs/parser/Main.class
	src/epdebs/game_objects/Game.java
	src/epdebs/parser/Main.java