up
Merge branch 'master' of https://github.com/julien-gargot/quiresiste

Conflicts:
	assets/styles/styles.css
fix error php