added my name
Merge branch 'master' of https://github.com/mugwhump/sfugamedev2013