thursday night
typo
Merge branch 'master' into availability

Conflicts:
	app/assets/stylesheets/application.css.scss
un peu de availability surtout du front sur l'index des flat
Merge pull request #22 from Eschults/availability

Availability