Merge pull request #1 from athahar/develop

Develop
Merge branch 'master' of heroku.com:scholarmatch into develop
removed the case regex for gender and added for city & college