Merge
Merge branch 'master' of github.com:jemah/enchord
Booyea
Delete html partials
Merge branch 'master' of github.com:jemah/enchord

Conflicts:
	routes/routes.js
Updates