bump for remark
Merge branch 'master' of git://github.com/discore/discore-interface

Conflicts:
	Makefile
	package.json