Added media player to activity_main
Merge branch 'master' of https://github.com/AaronPlave/Senuti.git

Conflicts:
	Senuti/bin/classes/com/example/senuti/MainActivity.class
	Senuti/res/layout/activity_main.xml
Merge branch 'master' of https://github.com/AaronPlave/Senuti.git

Conflicts:
	Senuti/bin/classes/com/example/senuti/MainActivity.class
	Senuti/gen/com/example/senuti/R.java