gemfile lock
Merge branch 'master' into marcus
deleted font awesome min css
required bootstrap in css and set the font-urls
Merge branch 'master' into marcus
Merge pull request #80 from elitenomad/marcus

fixed the font awesome issue, css file needed to require bootstrap plus set the font-urls