Merge branch 'master' of github.com:hahoje/test

Conflicts:
	README.md
Merge branch 'master' of github.com:hahoje/test