bootstrap 3
Merge branch 'master' of https://github.com/matttbe/sinf2255_solidareit_gr6_2013 into bootstrap_3

Conflicts:
	Gemfile.lock
	website/Solidare-IT-g6/Gemfile
	website/Solidare-IT-g6/app/assets/javascripts/application.js
	website/Solidare-IT-g6/app/assets/stylesheets/bootstrap_and_overrides.css.less
design in progress
warning bootstrap-picker in the trash temporary
mise en place
Removed Bauf shit
fix conflict
design color. Pink is in the place !
fix conflict
design
Design team work
add carousel step 1
begining popbox
color change and design full-width-header
Merge branch 'bootstrap_3' of https://github.com/matttbe/sinf2255_solidareit_gr6_2013 into bootstrap_3

Conflicts:
	website/Solidare-IT-g6/app/views/layouts/application.html.erb
beautiful and wonderful sticky search
sticky filter
better look for services
Merge branch 'bootstrap_3' of github.com:matttbe/SIT into bootstrap_3
popbox files
Email