removed maps
jakes commit. all good
Merge branch 'markupfix' of github.com:davidnuon/metermaids into markupfix
.
added gitignore
rm ds_store
removed ds_store
removed dsstore from everywhere
Merge branch 'sandals' of github.com:davidnuon/metermaids into sandals
does not work
Merge branch 'rooms' of github.com:davidnuon/metermaids into rooms
YESSS YESSS YESS IT WORKS
Merge branch 'rooms' of github.com:davidnuon/metermaids into slippers
rooms
Got rooms working

Don't join on connect, that makes no sensse