reset viewcount timestamp when viewcount is reset
reset timestamp when viewcount is reset
Merge branch 'master' of heroku.com:destinysearch
Merge branch 'gh-pages'

Conflicts:
	server.js
Merge branch 'gh-pages' of https://github.com/pandapaul/destiny into gh-pages
Merge branch 'master' into gh-pages