added comments and javadocs refactor methods
Merge remote-tracking branch 'origin/master'

Conflicts:
	Group-project/src/gameworld/Room.java
	Group-project/src/rendering/Renderer.java