update routes
Merge remote-tracking branch 'irma7/master'
Angular bug fix
Merge remote-tracking branch 'irma7/master'
update template
Add feed page
update feed page
Merge pull request #6 from bhushano7/master

Angular bug fix