committing so that I can update
Merge branch 'master' of github.com:mrcc912/meteowrite

Conflicts:
	node_modules/database.js
fixed the sorting order of teh top keywords for an article