start for slideshow
new release
Merge branch 'master' of github.com:ltbesh/Cours

Conflicts:
	.meteor/release
	client/main.html
	client/stylesheets/cours.css
	client/views/place/place_search_page.html
update dada
Merge branch 'master' of github.com:ltbesh/Cours
Merge branch 'master' of github.com:ltbesh/Cours

Conflicts:
	client/views/home/home.html
Merge branch 'master' of github.com:ltbesh/Cours
update to bootstrap 3
Merge pull request #12 from Dadaoxy/master

bootstrap 3
mainCarousel added
carousel upg
Merge remote-tracking branch 'coursLucas/master'

Conflicts:
	client/stylesheets/cours.css
	client/views/course/course_page.html
	client/views/course/edit_course_form.html
	client/views/home/home.html
	client/views/includes/nav.html
	client/views/place/edit_place_form.html
	client/views/place/place_tab_photo.html
	client/views/place/place_update_form.html
	client/views/time_slot/edit_time_slot_modal.html
pti commit bs 3 repair
Merge pull request #13 from Dadaoxy/master

bs 3