Båt
Merge branch 'master' of https://github.com/jonasberglund/skrubb_DAT255

Conflicts:
	README.md