RESET database and FIXED user.rb
Merge branch 'new'

Conflicts:
	app/models/user.rb
ADDED basic search page.
CHANGED search page layout.
Merge branch 'master' of https://github.com/josephktcheung/grasshopper into search_ui

Conflicts:
	app/assets/javascripts/application.js
	app/views/site/index.html.slim
Merged to latest version
ADDED basic search functionality on user email and ADDED skill_name to proficiency and user apis.
MERGING again
RESTORED *.lock files to .gitignore
DELETED <<<HEAD in index.html
ADDED skills on user search result.
Merge branch 'master' of https://github.com/josephktcheung/grasshopper into search_ui

Removed search code from site index.html

Conflicts:
	app/views/site/index.html.slim
CHANGED login/registration/password reset layout
IMPROVED name regex to allow multiple names, IMPROVED name input correction, ADDED user tests to verify them
FIXED legend text for registration/password reset e-mail forms
CHANGED the search ui formatting to css.
IMPROVED user name regexes and user rspecs (not working 100% yet)
UPDATED site#index template
MOVED index template made by Simon to indexTemplate.html.slim temporarily
CHANGED small formatting on search page.