Merge pull request #1 from Meghaasok/master

More information pages added for testimonials, tips and career guidance and also added the contents.
Done password reset feature
Merge branch 'master' of https://github.com/sureshvtt/entranceapp

Conflicts:
	entrance/entrance/urls.py
Added password change option for student
Added new model for subject image