merge
merge really
Merge pull request #16 from stuycs-ml7-projects/steven

changed format of joingame
merge
inheritance complete
Merge pull request #17 from stuycs-ml7-projects/steven

removed 'assassin' at the top
no more visible titles
backgrounds, divs
added stuff
Merge branch 'master' of github.com:stuycs-ml7-projects/forebrains
oops master
style
getting rid of that gap
style
maybe?
Merge branch 'master' into biggs
got start game working which fixed java script
Merge pull request #18 from stuycs-ml7-projects/biggs

Fixed Dina's problem. No map though, not sure why.
button disabling and map is back
added checkin button stuff to update marker