testing the EndOf_branch
test nr 2
a
qwe
lllkk
cleaning
Merge branch 'EndOf_branch' of local repository

Conflicts:
	JungleSpeed/src/com/vloprogrammers/junglespeed/PlayActivity.java
fq
Merge branch 'master' into Kam1x_branch