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

Conflicts:
	plan.html