fixed a couple lines
Merge branch 'Release3.0' of https://github.com/hawkin29/ChronoTimer1009 into Release3.0

Conflicts:
	src/main/java/edu/uwm/cs361/gui/FrontJFrame.java
Merge branch 'Release3.0' of https://github.com/hawkin29/ChronoTimer1009 into Release3.0
Merge branch 'Release3.0' of https://github.com/hawkin29/ChronoTimer1009 into Release3.0

Conflicts:
	src/main/java/edu/uwm/cs361/gui/FrontJFrame.java