Merge branch 'master' of https://github.com/deamullen/DiveComputer.git

Conflicts:
	src/model/SurfaceTimeTester.java