Semi done with login
commiting from egit
Login and Register rough skeleton
commit merge
committing conversation
register commit
committing new conversation
Merge remote-tracking branch 'upstream/master'

Conflicts:
	bigsky/src/bigsky/Conversation.java
committing changes for pull request
Deleting bin and Login and Registration improvements
login updates
Merge remote-tracking branch 'upstream/master'
push up merge fixes
pushing up no mysqltest and message client
Merge pull request #20 from Hartman2/master

Login and Registration skeleton
Merge pull request #3 from BlueText/master

Andrew's stuff and replacing conversation