deleted file
Merge branch 'master' of https://github.com/henrikjonhed/cprog3

Conflicts:
	.DS_Store
Merge branch 'master' of https://github.com/henrikjonhed/cprog3