final fixes
Fixed the way times were displayed
Merge branch 'master' of https://github.com/eakellogg/HashFortune

Conflicts:
	ServerCommands.js
	css/basics.css
	javascript/homepageFunctions.js
	javascript/procedures.js
	userLogs/WhiteNoise.txt
	userLogs/ZachB.txt
	userLogs/eliz.txt