added form standard
Merge branch 'master' of github.com:funnythingz/hackleberry

Conflicts:
	scaffolding.html