test commit 2

te
fsdf

dsaf
Merge branch 'master' of https://github.com/axelhildingson/groupName1

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