Nicer timestamp formatting
merge error fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/pages/response.html
	dist/index.html
	dist/views/pages/response.html
merge error fix
merge error fix