Trying again.
Merge branch 'master' of https://github.com/devinwalton/CS313

Conflicts:
	addTime.php