Test 2
Merge branch 'master' of https://github.com/jeffrwells/heartbeat

Conflicts:
	code/models/patient/patient.cpp