pre-pull
fixed conflicts
gem added/database.yml updated
gem updated/database.yml updated, space removed line 2user/edit
pre pull
afterpull
Merge pull request #43 from joemeers82/master

gem files changed