lllkk
Merge branch 'EndOf_branch' of local repository

Conflicts:
	JungleSpeed/src/com/vloprogrammers/junglespeed/PlayActivity.java