savz
Merge branch 'master' of
https://github.com/oskarwaglund/android-test.git

Conflicts:
	AndroidTest/src/com/example/androidtest/MainActivity.java