Merge pull request #1 from travisreed-wf/master

First Pull Request.
changed to windows
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
hopefully this fixes the merge conflict problem
Merge pull request #2 from Hartman2/master

Changed to windows
main menu
main menu retry
Conversation Pane
Merge pull request #3 from travisreed-wf/beginings

Conversation View
A few additional containers
line borders
test
test2
Beggining of the small chat window!!!
testing
test_again...
Merge remote-tracking branch 'upstream/master' into local/master
Merge pull request #4 from travisreed-wf/beginings

A few additional containers
Merge remote-tracking branch 'upstream/master' into local/master
Adding initial classes for client/server communication