Edited Readme
Merge branch 'master' of https://github.com/Bloqs/osf2014_poc

Conflicts:
	README.md