Added a README
Merge branch 'master' of https://github.com/jimray/cholla

Conflicts:
	README.md