Merge branch 'master' of https://github.com/ThomasKrauss/to-web

Conflicts:
	README.md
Merge branch 'master' of https://github.com/ThomasKrauss/to-web

Conflicts:
	README.md