GOD DAMN LOGFILES!
GOD DAMN LOGFILES AGAIN!!!!
Merge branch 'master' of https://github.com/WarLib/yapps

Conflicts:
	Ogre.log