Jadada,
Merge branch 'master' of github.com:buren/test

Conflicts:
	README.md