sun stuff
Merge branch 'develop' of https://github.com/mborjesson/GameJam-1.0.git into develop
sun colors
Merge branch 'develop' of https://github.com/mborjesson/GameJam-1.0.git into develop
imports
Merge branch 'develop' of https://github.com/mborjesson/GameJam-1.0.git
into develop

Conflicts:
	src/gamejam10/states/LevelCompletedState.java
Merge branch 'develop' of https://github.com/mborjesson/GameJam-1.0.git
into develop

Conflicts:
	src/gamejam10/states/LevelCompletedState.java
Merge branch 'develop' of https://github.com/mborjesson/GameJam-1.0.git
into develop

Conflicts:
	src/gamejam10/states/LevelCompletedState.java