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
Quick Pre-Minecraft Commit

Checked branch merges and stuff and added a crappy text box to the
client. Also changed the title to something mostly less generic.
Added dialog class and basic Client GUI

I added a basic GUI for the client so that we can test and implement
some graphical functionality. I also added a simple custom dialog class
so that we can have easy server/port input from the client. I'm still
mulling over just using SWT/Swing for that because the way I did it
feels hackish.
Added connection for connect button in Client GUI

Also ran a test with Server and Client. The user seems to be able to
connect fine to the server, but there are a couple of outstanding
issues:

1) The username appears about 10 or so times in the stdout log.
2) The Client seems to want to hang after connection. Perhaps something
went unchecked in the Client.run() dialog from my changes today. I'll
look into it later.
Commented like a good coder

// no comment
Client Dialog fixes and Username field.

Fixed a few bugs from the really hackish implementation I had before
this one. Decided to actually go with SWT custom dialogs this time for
the sever input. Got it all working right for the most part. There's
still a bug where the username connects like 800 times.

Also made the look and feel prettier.
Merge pull request #5 from adamwethington7/Adam

Adam