bump
Merge branch 'master' of https://github.com/mdsumner/roc
updates
Conflicts:
	DESCRIPTION