Conficting commit
Merge branch 'master' of https://github.com/sweer/test

Conflicts:
	README.md