Commiting to take care of merge conflicts
Edward Goldthorpe
Merge branch 'master' of
https://github.com/RHITJuniorProjects/JrProj-1415-Mike.git

Conflicts:
	Code/Android/src/src/rhit/jrProj/henry/TaskDetailFragment.java