ment index
Merge branch 'master' of https://github.com/seanfred/mentor-match

Conflicts:
	app/views/mentorships/index.html.erb
	db/development.sqlite3
	log/development.log
mentorships index