added classes

added classes
Merge branch 'Christoph'

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