Inform people that the code is in active development and it is being
worked on in the develop branch
Merge branch 'develop'

Conflicts:
	README.md
Merge branch 'develop'