Form plan
Merge branch 'master' of https://github.com/trottierm/faire-face

Conflicts:
	index.html