pull for eliz
Merge branch 'master' of https://github.com/eakellogg/HashFortune

Conflicts:
	javascript/procedures.js
to combine
Merge branch 'master' of https://github.com/eakellogg/HashFortune

Conflicts:
	ServerCommands.js
	javascript/procedures.js
Fixed merge issues