Initial commit
Added readme
initial code commit
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
	README.md