Muhaha, somethings going wrong here
Merge branch 'master' of https://github.com/sorenmalling/goos-test

Conflicts:
	README