Update README.md
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
Update README.md
Merge pull request #10 from LeonIRL/master

Prototype