Changes I made before meeting today. Will overwrite.
Merge branch 'timBranch' of https://github.com/zlesperance/Holiday-Mailer into timBranch

Conflicts:
	holidayMailer/MailControl.java

Pulling from timBranch what I did today