changed mainactivity and mainactivity2
Merge branch 'master' of https://github.com/team-LRP/Guess_The_Voice

Conflicts:
	teamlrp/src/main/res/layout/activity_main2.xml