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
failed attempt
implemented ajax for form, and js autofill for preview
implementing js forms
merged with js_confirm
javascript implemented for form preview, edit, and submit
implemented multiple email recipients
minor changes in controller