Refactor directory methods and helper methods
Merge branch 'master' of https://github.com/periwinklepath/mkdir

Conflicts:
	Gemfile
	app/assets/stylesheets/application.css.scss
	app/controllers/directory_controller.rb
	app/helpers/directory_helper.rb
	app/models/mentor.rb
	app/models/student.rb
Update user pic. Ignore mergetool files