change 3 Trev
Merge branch 'master' of https://github.com/TrevRawr/GDC-Dev-Fall-2014

Conflicts:
	test.txt