Lets hope I didn't screw this up. <3
Merge remote-tracking branch 'origin/zakk'

Conflicts:
	cubejumper/src/com/me/cubejumper/bases/BaseLevel.java
	cubejumper/src/com/me/cubejumper/levels/Level1.java