Merge https://github.com/khushbu14/webportal into new3
done
Merge https://github.com/khushbu14/webportal into new3
Merge https://github.com/khushbu14/webportal into new3
Merge https://github.com/khushbu14/webportal into new3
done
Merge https://github.com/khushbu14/webportal into new3
pagination in all pages n marquee in front page
done
Merge pull request #64 from priyamvadachundawat/new3

New3
changes in templates
Merge branches 'master' and 'master' of https://github.com/khushbu14/webportal

Conflicts:
	templates/content.html
Merge branch 'master' of https://github.com/khushbu14/webportal