test
okej
ja
gg
j
jo
uhmm
nu
Merge branch 'master' of http://github.com/oskarwaglund/android-test.git

Conflicts:
	AndroidTest/bin/AndroidTest.apk
	AndroidTest/bin/classes.dex
	AndroidTest/bin/resources.ap_
Merge branch 'master' of https://github.com/oskarwaglund/android-test.git