Database changed....
Merge branch 'timBranch' of https://github.com/zlesperance/Holiday-Mailer into timBranch

Conflicts:
	holidayMailer.db

Still working on resetting timBranch
Wired up MailControl Object to handle the database access
Merge branch 'master' into timBranch

Conflicts:
	holidayMailer.db
	holidayMailer/AlertWindowController.java
	holidayMailer/GUIClient.java
	holidayMailer/SendMailWindowController.java

Resolving conflicts with merge
Merge branch 'timBranch'
Cleaned up MailControl action on program exit
Merge branch 'timBranch' of https://github.com/zlesperance/Holiday-Mailer into timBranch
Changed to take in file

Chanaged input from string to file
Merge pull request #21 from zlesperance/timBranch

Tim branch
Merge pull request #22 from zlesperance/Mailer3

Changed to take in file
Merge branch 'master' into FilterWork

Conflicts:
	holidayMailer/MailerGUIController.java
	holidayMailer/SendMailWindowController.java

Merge FilterWork Branch