initial commit
Merge remote-tracking branch 'colin/master'

Conflicts:
	README.md