Several changes, User/Events are now classes
Merge branch 'master' of https://github.com/emrickgarrett/Team2CodeForGood