deleted
Merge branch 'NewHitsPage' into James_Test
created custom hit dialog
Merge branch 'James_Test' into dev
Merge remote-tracking branch 'origin/ChristiansBranch' into James_Test

Conflicts:
	MFA/src/com/example/activities/ChooseRival.java
	MFA/src/com/example/listViewComponents/HitListViewAdapter.java
Merge branch 'James_Test' of https://github.com/UnbrandedTech/MFA into James_Test

Conflicts:
	MFA/src/com/example/activities/ChooseRival.java
	MFA/src/com/example/listViewComponents/HitListViewAdapter.java
Merge branch 'James_Test' into dev

Conflicts:
	MFA/AndroidManifest.xml
	MFA/res/layout/activity_new_menu.xml
	MFA/src/com/example/activities/ColorOptionsActivity.java
	MFA/src/com/example/activities/Game.java