adding bcrypt to gemfile
adding httparty to gemfile
precompiled
Merge branch 'develop'
css