here it is
failed at adding the last couple files
pulling in events
pulled in the event merge request
events fixed
event tests set up
forgotten password now works
Merge pull request #24 from loganwatanabe/master

Fixed Event problems and Added some methods
Merge branch 'master' into mailer
merges recent event updates with new mailer updates