installed twitter bootstrap
Added figaro and annotated what gems are what
installed twitter bootstrap gems
Annotated models
gemfile conflict fix
fixed conflict
Added active admin
Fixed merge conflicts and added Bootstrap sass
Removed less-rails gem