Updates!
Merging develop into master for deployment.

Conflicts:
	LICENSE.md
	README.md