hmm
Merge branch 'gith6'

Conflicts:
	README.md