deleted
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