merge
merge really
changed format of joingame
Merge pull request #16 from stuycs-ml7-projects/steven

changed format of joingame
merge
inheritance complete
removed 'assassin' at the top
Merge pull request #17 from stuycs-ml7-projects/steven

removed 'assassin' at the top
no more visible titles
added stuff