no push
Merge branch 'master' of https://github.com/TeamBramble/SuperMario

Conflicts:
	SuperMario2/SuperMario2/SuperMario2/ClassDiagram.cd
	SuperMario2/SuperMario2/SuperMario2/Enemy.cs
	SuperMario2/SuperMario2/SuperMario2/SuperMario2.csproj
	SuperMario2/SuperMario2/SuperMario2/SuperMario2Main.cs
Merge branch 'master' of https://github.com/TeamBramble/SuperMario

Conflicts:
	SuperMario2/SuperMario2/SuperMario2/ClassDiagram.cd
	SuperMario2/SuperMario2/SuperMario2/SuperMario2Main.cs
Добавени 3 вида Enemy и тест

//SuperEvil трябва да се помисли override-a