Added blood pressure to the alerts.
WIP physician summary page
Merge branch 'dev' of https://github.com/gannicottb/cor into physician
Populate adds sodium readings, Patient now has a Sodium Metric!
patient/alerts styling begun
Created Activity model
Set up association between patient and activity
Added the code to grab activity data and display in the Activity Log screen
Stacked bar chart for activity tracking is working now!
Merge branch 'dev' of https://github.com/gannicottb/cor into physician
Exercise log displays more or less correctly!
Alerts updated with sodium and weight alerts
Merge branch 'alerts' into dev
Added simple steps display to activity log
Merge branch 'dev' of https://github.com/gannicottb/cor into dev
nav modified to wireframes without colors
pulled and nav styled
made graphs (minus activity + medication) work on summary screen
Merge branch 'physician_detail' of https://github.com/gannicottb/cor into physician

Conflicts:
	cor-dashboard/app/models/patient.rb
added trivial stylistic changes