GUI update
Merge branch 'master' of https://github.com/aag2423/cs354r-assignment2

Conflicts:
	CEGUI.log
	Ogre.log
	OgreApp