^^'
Merge branch 'master' of https://github.com/MaxenceAdnot/siteS3

Conflicts:
	workspace.xml