ingore database.yml
Merge branch 'master' of github.com:memoxmrdl/memoxsoft
update gemfile