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

Conflicts:
	src/com/group15/djhero/fragment_list.java