Units updated
oikl
Merge branch 'basic_functional' of https://github.com/aivel/RPG

Conflicts:
	.idea/workspace.xml
	Game/src/game/model/GameObject.java