getting Brian's stuff to work
Merge branch 'master' of https://github.com/toneill818/Game