gemfile.loc
merge
changed display status
Merge branch 'master' of github.com:gonecase/colloquy_new