gitignore
Merge branch 'master' of github.com:00promise/00promise_rails
Merge branch 'develop' of github.com:00promise/00promise_rails
Merge branch 'master' into develop