changed server.js
Merge branch 'master' of https://github.com/nathanbreitsch/storytime
Fixed merge on server.js getServerTime function.

Conflicts:
	server/server.js