Merge pull request #2 from emrickgarrett/master

Update
Several changes, User/Events are now classes
Merge branch 'master' of https://github.com/emrickgarrett/Team2CodeForGood
changes
Big changes
Small error
Merge pull request #6 from brobinson09/master

Merge pull request #2 from emrickgarrett/master
Some fixes
Merge branch 'master' of https://github.com/emrickgarrett/Team2CodeForGood
Merge pull request #3 from emrickgarrett/master

asdf