Gitignore
Merge branch 'karim-preprod' into preprod
Merge branch 'preprod'

Conflicts:
	.gitignore
Merge pull request #91 from OuiShare/master

blabla
Merge pull request #92 from OuiShare/preprod

Merge pull request #91 from OuiShare/master
Header fixed, added new images
gitignore
Merge branch 'preprod'
Header changes, adds team in participants page
Merge branch 'preprod' of https://github.com/OuiShare/OuiShare-Fest
Team subpage
Team link
Merge remote-tracking branch 'origin/master' into karim-preprod