more testing
master conflict resolution
Merge branch 'master' into more_testing
no comment
more styles for all pages
test coverage at 86.56%
conflicts resolved
workin on final styles
added add/remove emails
Merge remote-tracking branch 'origin/final_styles' into add_emails
minor addition
hope this works
minor addition
order page updated
confirmed that emails are being sent
fixed merge conflicts for caching branch
fixed merge conflicts for cane branch
fixed conflicts with final styles branch
cane cleanup