added a function to return a User object based on uid. -MM
Merge branch 'master' of https://github.com/MassBayCS225/EMS
Merge pull request #64 from WannabeSid/master

Small fix
Merge pull request #65 from WannabeSid/master

Commit for David
added a main manager.java
Merge pull request #66 from jkuk/master

adding main manager
commented out database calls in eventmanager
Merge pull request #67 from jkuk/master

event manager
Start of the merge