test
Start with making ClassDiagram1.cd!
Merge branch 'master' of github.com:Marto89/Sea-Breeze

Conflicts:
	Bomberman/Bomberman/Bomberman.csproj
	BombermanGame/bin/Debug/BombermanGame.exe
	BombermanGame/bin/Debug/BombermanGame.pdb
	BombermanGame/bin/Debug/BombermanGame.vshost.exe
	BombermanGame/obj/Debug/BombermanGame.csproj.FileListAbsolute.txt
	BombermanGame/obj/Debug/BombermanGame.csprojResolveAssemblyReference.cache
	BombermanGame/obj/Debug/BombermanGame.exe
	BombermanGame/obj/Debug/BombermanGame.pdb
	BombermanGame/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache