resolved conflict on images show
Added Glyph fonts
Added Glyph fonts
commit again
mad props to marco for getting glpyfonts working
added rubyracer and less-rails-bootstrap gems to get glyphicon fonts working.
Merge pull request #20 from otters-2014/GlyphFonts

Glyph fonts