test2
test3

wqe
test12

wqe
test12.2

qwe
tests

12
Merge branch 'master' of https://github.com/nisako/AraProjeNew

Conflicts:
	AraProjeNew/bin/classes/com/example/araprojenew/GameScene.class