one
Merge branch 'master' of https://github.com/brollins90/csc130_nim
deleted the two things that I added to test
added a controller to test with and changed PLayer to be an abstract
class, rather than an interface