committing
Merge pull request #41 from RichardHayesMassbay/master

Linked up the GUI panels
Added Budget based classes

Classes might need to be more indepth in the future
working on committees table -MM
Merge branch 'master' of https://github.com/MassBayCS225/EMS
Merge remote-tracking branch 'upstream/master'
Modified Participant and Phone Number classes
updating user and user manager
Merge pull request #42 from daverboy23/master

User and UserManager
Merge pull request #43 from andy2013march/master

Modified PhoneNumber and Participant
Fixed double class typo
Merge pull request #44 from daverboy23/master

User and UserManager
minor tweaks...
Merge branch 'master' of https://github.com/MassBayCS225/EMS
COMMIT MESSAGE

blah
Merge pull request #45 from daverboy23/master

commit
fixed issues with UserData class. Now takes User as a type. Added a remove function as well. -MM
commit issues?
all managers except for usermanager will compile now, changed some of ketty's classes to compile (added null returns and such), and removed a couple useless files
Merge pull request #46 from jkuk/master

Fixed up some things