web site integration
Merge branch 'release/0.1.0'

Conflicts:
	converter.html
	index.html
Update README.md
Merge branch 'develop'

Conflicts:
	converter.html
	index.html
what a messy merge
Merge branch 'develop'
test deploy