Anual
Merge branch 'master' of https://github.com/Thrusher/Health-Hackathon

Conflicts:
	Health Hackathon.xcodeproj/project.pbxproj