deployed on DigitalOcean
deployed on DO
Merge branch 'production' of https://github.com/brucewar/duapp into production

Conflicts:
	config.js
	controllers/search.js
ignore nohup.out
change page icon
merge
google validate
Merge branch 'production'

Conflicts:
	.gitignore