added test branch 2 button

added test branch 2 button
Merge branch 'testbranch2'

Conflicts:
	src/app/SkyLife.java