Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 63f4984258dcab51acd8cca3b9dc9d944ecec534, reversing
changes made to 9884cbdfa8a8e97bb8bda2b19d69be64c505fd76.
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