Test commit branch kevin
test commit branch master !
Merge remote-tracking branch 'origin/master' into kevin

Conflicts:
	index.html
Add 2nd Test
Premier commit
Merge branch 'Robin' of https://github.com/Maxipanda/N-Six into Robin
Merge branch 'master' of https://github.com/Maxipanda/N-Six into Robin
new repo v2
Test commit 3
Merge branch 'master' of https://github.com/Maxipanda/N-Six into christophe
Merge branch 'master' of https://github.com/Maxipanda/N-Six into Robin
test push branch
test merge
Structure Pics Added
Merge branch 'master' of https://github.com/Maxipanda/N-Six into christophe
Merge branch 'master' of http://github.com/Maxipanda/N-Six into laurianne
aide Javascript pour création d'objets
Merge branch 'master' of https://github.com/Maxipanda/N-Six into christophe
Merge branch 'master' of https://github.com/Maxipanda/N-Six into kevin
Merge branch 'master' of http://github.com/Maxipanda/N-Six into laurianne