it is telling me to commit
Merge remote-tracking branch 'upsteam/master'
small chat is almost working needs to be able to scroll still
scroll now working
Merge pull request #5 from jdmielke/master

SmallChat
Merge remote-tracking branch 'upstream/master'
Taskbar and Connections to small chat and conversation set.