Anaïs Romand
Merge branch 'master' of https://github.com/anaisromand/coursiut

Conflicts:
	css/bootstrap-responsive2.css