boss battle and sun bonus battle
Merge branch 'master' of https://github.com/chooper9/cs354r-assignment4

Conflicts:
	CEGUI.log
	Ogre.log
	OgreApp
	OgreApp-Game.o
	OgreApp-Pluto.o
	OgreApp-ScenePlanet.o
	OgreApp-SceneSpace.o
	SceneSpace.cpp
	libtool
boss battle and sun battle