pilledutt
Merge branch 'master' of https://github.com/Fillebubben/testScore

Conflicts:
	src/com/example/testscore/MainActivity.java