Updated Description
Merge branch 'master' of https://github.com/FatalEagle/Maniacal-Midsummer-Marathon-2014

Conflicts:
	README.md