Initial commit
Merge remote-tracking branch 'howard/master'

Conflicts:
	README.md
changed to http from https