fragments
Merge branch 'master' of https://github.com/SM719/DJHero

Conflicts:
	AndroidManifest.xml
	src/com/group15/djhero/DJInterface.java