Name again

Added my name
Merge remote-tracking branch 'origin/master'

wow.

jason is a bad teacher.
Merge branch 'master' of https://github.com/boak1/Sidescroller_VGDCFall2014

Conflicts:
	Text File Assignment (Add Your Name and Push).txt