Last main commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	MarioLevelComp/src/gameai/BlazeLevel.java
commenting clean up