changes file .gitignore
fix unmerged files
Merge branch 'master' of https://github.com/tshap88/Chat into user1
rename variable charServer1 -> charRead