working on loginview and sync view
Merge branch 'master' of https://github.com/Thrusher/Health-Hackathon

Conflicts:
	Health Hackathon/Base.lproj/Main.storyboard
	Health Hackathon/HistoryView.h
	Health Hackathon/LoginView.h