Working Commit before branch update.
Merge remote-tracking branch 'origin/master' into Adam
Merge branch 'Adam' of https://github.com/adamwethington7/clientserverchat into Adam

Conflicts:
	eclipse workspace 1/.metadata/.log
	eclipse workspace
1/.metadata/.plugins/org.eclipse.core.resources/.history/2c/e005328b476600141ad2ed443f3e6a06
	eclipse workspace
1/.metadata/.plugins/org.eclipse.core.resources/.history/32/10e019fe466600141ad2ed443f3e6a06
	eclipse workspace
1/.metadata/.plugins/org.eclipse.core.resources/.history/72/20d936c7436600141ad2ed443f3e6a06
	eclipse workspace
1/.metadata/.plugins/org.eclipse.core.resources/.history/77/9090390a8a6700141c6daa63774976c2
	eclipse workspace
1/.metadata/.plugins/org.eclipse.core.resources/.history/d5/5096eb8f476600141ad2ed443f3e6a06
	eclipse workspace
1/.metadata/.plugins/org.eclipse.core.resources/.projects/CSC_440_Team_Project/.indexes/e4/35/history.index
	eclipse workspace
1/.metadata/.plugins/org.eclipse.core.resources/.projects/CSC_440_Team_Project/.indexes/e4/9b/history.index
	eclipse workspace
1/.metadata/.plugins/org.eclipse.core.resources/.projects/CSC_440_Team_Project/.indexes/e4/bd/history.index
	eclipse workspace
1/.metadata/.plugins/org.eclipse.core.resources/.projects/CSC_440_Team_Project/.markers
	eclipse workspace
1/.metadata/.plugins/org.eclipse.core.resources/.projects/CSC_440_Team_Project/org.eclipse.jdt.core/state.dat
	eclipse workspace
1/.metadata/.plugins/org.eclipse.core.resources/.root/13.tree
	eclipse workspace
1/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	eclipse workspace
1/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	eclipse workspace
1/.metadata/.plugins/org.eclipse.jdt.core/3902056358.index
	eclipse workspace
1/.metadata/.plugins/org.eclipse.jdt.core/assumedExternalFilesCache
	eclipse workspace
1/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	eclipse workspace
1/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	eclipse workspace 1/.metadata/version.ini