quelques modifs
Merge branch 'master' of https://github.com/clemfeelsgood/Prynt
Merge branch 'master' of https://github.com/clemfeelsgood/Prynt
changement de branche pour css
update
changes
Merge branch 'clement'

Conflicts:
	app/views/preorder/index.html