Add form page
Merge remote-tracking branch 'irma7/master'

Conflicts:
	client/feeds.html
git ingore
Merge pull request #7 from bhushano7/master

git ingore