Nanny now talks yay!
Merge branch 'master' of https://github.com/zebbedy/jcc2d

Conflicts:
	JimmysCardboardCastle/LevelLoader.h
	JimmysCardboardCastle/levelConstructor.cpp
	JimmysCardboardCastle/levels/level1.txt
Fixed merging.