test2
Merge branch 'master' of https://github.com/Jakob-FHD/musapp

Conflicts:
	eclipse/res/layout/activity_main.xml