redo
Merge branch 'master' of github.com:snuttjulle/test

Conflicts:
	README.md
redo