Cancel reverse parse button
Merge branch 'master' of github.com:jemah/enchord

Conflicts:
	views/partial_editsong.ejs
Merge branch 'master' of github.com:jemah/enchord
Pagination on live query fix