created login/register
sockets map
merged master
merged login branch