branching
map container in it's own header file. prepared client code for chatting. need its peer list
prepared client for chatting
Merge branch 'dlee440' into sjklein92_b

Conflicts:
	client.cpp

Merged forever-loop code with room-select code.
fixed compiler errors
Merge branch 'dlee440' of github.com:leonardhsin/3251p2p into sjklein92_b

Latest fix.
Fixed merge conflicts