Merge pull request #6 from bhushano7/master

Angular bug fix
Add form page
add feed
Merge remote-tracking branch 'irma7/master'

Conflicts:
	client/feeds.html