Fixed command line user name placement
Merge branch 'develop' of https://github.com/donnell74/460-Project into develop
Fixed message window bug
Fixed merge conflict