My name

Name
Merge branch 'master' of https://github.com/hidamaru/dd2434project

Conflicts:
	hej.txt