fixing
Merge branch 'master' of https://github.com/cfly15/canopi-curate

Conflicts:
	canopi-curate.sublime-workspace