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
Merge branch '05_controller_basics' into 06_advanced_controllers
Merge branch '06_advanced_controllers' into 07_controller_cleanup
Merge branch '07_controller_cleanup' into 08_features
Merge branch '08_features' into 09_speedup
Merge branch '09_speedup' into 11_tdd
update to new rspec mocking syntax
Merge branch '09_speedup' into 11_tdd