sagargp/trollicons — pull request #48 by Derikulous (2014-11-05 06:59:15+00:00)
Title: remove conflict markers. added rake to gemfile.

using Ruby 2.1.0, could not build without adding rake to gemfile