Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
Cleaning up the useless code from earlier