db config change
fixed merge conflicts
Merge branch 'darran-dev' of github.com:ardmore/linenhall-library into darran-dev
commiting before pull
Merge branch 'darran-dev' of github.com:ardmore/linenhall-library into darran-dev
Merge branch 'darran-dev' of github.com:ardmore/linenhall-library into darran-dev
added member emailer to member_mailer.html