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
ADDED basic search functionality on user email and ADDED skill_name to proficiency and user apis.
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 the search ui formatting to css.
CHANGED small formatting on search page.
Merge branch 'master' of https://github.com/josephktcheung/grasshopper into search_ui

Resolved conflicts.

Conflicts:
	app/assets/javascripts/angular/users_controller.js.coffee
	app/assets/stylesheets/application.scss
	app/views/site/index.html.slim
MOVED search template to assets and created angular route for search.
ADDED search by skills.
ADDED search by skills.
ADDED search by skills.
Merge branch 'master' of https://github.com/josephktcheung/grasshopper into search_ui

Resolved conflicts on application.scss

Conflicts:
	app/assets/stylesheets/application.scss
Merge pull request #33 from annieccheung/search_ui

Search UI