Test passing
Merge branch 'version2' of https://github.com/stephzilla/mentor-match into version2
Fix merge conflicts