let's see what happens
Merge branch 'master' of https://github.com/zlesperance/Holiday-Mailer

Conflicts:
	.classpath
I hope to hell this doesn't get pushed out to y'all
Merge branch 'master' of https://github.com/zlesperance/Holiday-Mailer
adding javax.mail to repository
Moved javax.mail.jar to lib folder
adding javax.mail.jar to lib folder
Updated .classpath to point at javax.mail.jar in lib
Added package declaration to Steve's java files.
updated my Eclipse classpath to include the thing in UserIn.java we need
accidentally hit return as a modification to the file, git wont let me do anything until I commit the update....
Merge pull request #14 from zlesperance/GUIWork

Gui work
Merge pull request #15 from zlesperance/GUIWork

Added "Remove Selected" window & Other stuff
Created MailControl class for streamlined database access. Added equals method to Contact class

I will need to Modify the files that access the database directly to use the MailControl object
Merge branch 'master' into timBranch

Conflicts:
	.classpath
	holidayMailer.db
	holidayMailer/Contact.java
	holidayMailer/SendMailRun.java
	holidayMailer/UserOut.java
	holidayMailer/iUserOut.java

Merge master into timBranch
Merge branch 'timBranch'
Update .gitignore to fix classpath because Eclipse
Removed init calls to make Eclipse happy
Apparently it changed its mind about if it like them. Whatever
Recover the database
Apparently I deleted in when merging Tim's branch. Oops
Minor updates to Client and Main Form
Minor change to make Eclipse stop yelling at me again