linksupdated
conflict resolution
navbar
Merge branch 'feature/schoolpage' into develop

Conflicts:
	Parent-Teacher/app/models/teacher.rb