doesnt work because of encoding(at least :)
Merge branch 'master' of https://github.com/bronti/temp

Conflicts:
	README.md