hello again
Merge branch 'master' of https://github.com/EmilSodergren/gitcourse2

Conflicts:
	README
Merge branch 'master' of https://github.com/EmilSodergren/gitcourse2