rout pull
remove merging
Merge branch 'master' of https://github.com/axenictech/Educational-ERP

Conflicts:
	app/views/students/student_profile.html.erb
	config/routes.rb
	log/development.log
remove merging three
remove merging three