updates for Thursday
updated flashDemo
commit
updates for tues class
cancan and mailers
updated notes
Merge remote-tracking branch 'upstream/master'