bla

bla
Merge branch 'master' of https://github.com/c8r1z1/SkyLife

Conflicts:
	bin/SkyLife.class
	src/SkyLife.java
	src/SkyLifePanel.java