Test
Merge branch 'master' of https://github.com/VitoInfinito/dat076-ws3

Conflicts:
	.gitignore