kram
Merge branch 'master' of https://github.com/kevinnoll/prog3

Conflicts:
	.gitignore