rrr
Merge branch 'gh-pages' of https://github.com/mrlong/MySearch into gh-pages

Conflicts:
	routes/index.js