better description of this repository
Merge branch 'conflict-on-readme'

Conflicts:
	README.md

  Decided to resolve with a combination
  of both conflict-on-readme branch
  and master.