Source Code 2

SourceCode2
Merge branch 'master' of https://github.com/jrharrel/group8healthtracker

Conflicts:
	Source Code 1/calculatorMain.java
	Source Code 1/display/NotificationFrame.java
	Source Code 1/display/StringFrame.java
	Source Code 1/records/HealthIndicators.java
	Source Code/Driver.java
	Source Code/SignInFrame.java
	Source Code/StringFrame.java
	Source Code/calculatorMain.java
v2

blah
blah

blah blah