add test blade for logic
merge master to venkman
add mater to venkman
Merge branch 'master' into venkman
password reset functionality
Add sharon's newstuff
merge branch 'master' into venkman
edit remindercontroller
Merge pull request #24 from blind-squirrel/venkman

Venkman