added form
Merge branch 'master' of github.com:CharlotteFeather/Project

Conflicts:
	app.rb