Added a message
Merge branch 'master' of https://github.com/mugwhump/sfugamedev2013

Conflicts:
	README.md
Merge remote-tracking branch 'origin/master'
Added my name.
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
Added my name.
Merge branch 'master' of https://github.com/mugwhump/sfugamedev2013