Added all Project files
Merge branch 'master' of github.com:lefko/Spo12h_Labb1

Conflicts:
	.gitignore