instance variable
Merge branch 'master' of https://github.com/191-Group-4/partner

Conflicts:
	app/views/users/_student.html.erb