Minor updates to Client and Main Form
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
Merge branch 'GUIWork' of https://github.com/zlesperance/Holiday-Mailer into GUIWork

Conflicts:
	holidayMailer/GUIClient.java

Finish merge
Add Context Menu for table rows
Context menu not fully functional yet
Fix button bindings and add buttons
Filter Buttons not working yet, but the rest should be
send button functionality

This should work
Merge pull request #17 from zlesperance/SendMailWindowControllerUpdate

send button functionality
works now

changed the email we send from so that it will work and closes the send
window when done
Added attachments

Added attachments functionality
changed email

to be consistant
Merge pull request #18 from zlesperance/Mailer3

Mailer3
Merge pull request #19 from zlesperance/SendMailWindowControllerUpdate

works now
Merge branch 'master' into timBranch

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

Resolving conflicts with merge