prepa

@author: cedric
Merge origin/master

Conflicts:
	index.html
Merge origin/master

Conflicts:
	index.html
Merge origin/master

Conflicts:
	js/anim.js
Merge origin/master

Conflicts:
	js/anim.js
Merge origin/master

Conflicts:
	js/lib.js