MAJ
Merge branch 'master' of https://github.com/Touristes/2SN

Conflicts:
	abo.png
	database/database.db
	message.png
	styleFooter.css
	triforce.png