adding more crap to main file
Merge branch 'master' of https://github.com/TrevRawr/GDC-Dev-Fall-2014 into feature
integrating new feature
Conflicts:
	Test Doc.txt