test2

Signed-off-by: Jeff Wells <jeff@jeffrwells.com>
Merge branch 'master' of github.com:jeffrwells/heartbeat

Signed-off-by: Jeff Wells <jeff@jeffrwells.com>

Conflicts:
	code/models/patient/patient.cpp