It's done. I think.
Merge remote-tracking branch 'origin/Victor'

Conflicts:
	Game/.idea/workspace.xml
Onto Comments!