Merge pull request #47 from Derikulous/master

refactor that color. forever alone
remove conflict markers. added rake to gemfile. using Ruby 2.1.0 wouldn't allow me to build without it