fd

vg
Merge branch 'develop'

Conflicts:
	README.md
Update marque
Merge branch 'master' into develop

Conflicts:
	README.md
Merge branch 'develop'
s
dfbd
Merge branch 'master' into develop

Conflicts:
	README.md
SFQSF
dsgs
Merge branch 'develop'

Conflicts:
	README.md
hl

hjl
Merge branch 'master' of git://github.com/abbenbouchta/pro
Merge branch 'develop' of git://github.com/abbenbouchta/pro into develop

Conflicts:
	marque