A basic README file and license
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
Merge pull request #62 from settinghead/master

A basic README file and license