Initial commit
initial commit
forgot to change readme
Merge remote-tracking branch 'erich/master'

Conflicts:
	README.rst