???
Merge branch 'master' of github.com:teamMadScientist/DeathCurtain_prototype
Test of special patterns
Merge branch 'master' of github.com:teamMadScientist/DeathCurtain_prototype
Merge branch 'master' of github.com:teamMadScientist/DeathCurtain_prototype
Merge branch 'master' of github.com:teamMadScientist/DeathCurtain_prototype
Merge branch 'master' of github.com:teamMadScientist/DeathCurtain_prototype
Pattern test
Merge branch 'master' of github.com:teamMadScientist/DeathCurtain_prototype

Conflicts:
	damncute/APattern.hh
	src/Actions/ActWeapon.hh
Merge branch 'master' of github.com:teamMadScientist/DeathCurtain_prototype

Conflicts:
	Makefile
Merge branch 'master' of github.com:teamMadScientist/DeathCurtain_prototype
Merge branch 'master' of github.com:teamMadScientist/DeathCurtain_prototype
Conflits :(
Merge branch 'master' of github.com:teamMadScientist/DeathCurtain_prototype

Conflicts:
	damncute/Core/Core.cpp
	damncute/Menu.cpp
	damncute/Menu.hh
	src/DisplayManager.cpp
Merge branch 'master' of github.com:teamMadScientist/DeathCurtain_prototype
config
Merge branch 'master' of github.com:teamMadScientist/DeathCurtain_prototype

Conflicts:
	damncute/Core/Core.cpp
	src/DisplayManager.cpp
Config file