Changed to show what has been done
Merge branch 'Kristoffers_workingbranch'

Conflicts:
	README.md -fixed