update twitter bootstrap gem to 2.2.8
resolve conflict in gemfile
Merge branch '02_setup' into 03_models
Merge branch '03_models' into 04_factories
Merge branch '04_factories' into 05_controller_basics