all kind of stuff
mergeMerge branch 'master' of https://github.com/TeamZilla/Destroyer

Conflicts:
	vs2013/Destroyer/include/SoldierBehavior.hpp
	vs2013/Destroyer/internal/testi.txt