somehtin
Merge branch 'master' of github.com:christinebeaubrun/MH_timesheets
Merge branch 'master' of github.com:christinebeaubrun/MH_timesheets
pulling from master
resolved merge conflicts
deleted development.log
Merge branch 'master' of github.com:christinebeaubrun/MH_timesheets
reset database
resolved merge conflicts
deleted dev log
modified dev log
working on email template
Action mailer works