this should work
Merge branch 'master' of https://github.com/samjhill/MiddleMan

Conflicts:
	Middleman/Middleman/src/main/java/com/team/hv/middleman/middleman/MiddleManMainActivity.java