Merge
Merge branch 'master' of github.com:jemah/enchord

Conflicts:
	views/search.ejs
Update search page