some shit :D
Socket messages, and some merges.
Merge remote-tracking branch 'origin/master'