REMOVED dumb code
ADDED Search bar
REMOVED 'HEAD' comment from git conflict
Merge branch 'master' of github.com:josephktcheung/grasshopper into angular
RESTORED *.lock files to .gitignore
ADDED basic stars for rating to profile page
DELETED <<<HEAD in index.html
ADDED full stars with faded stars
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
IMPROVED user name regexes and user rspecs (not working 100% yet)
Merge branch 'profile-page' of github.com:Simon245/grasshopper into angular

RESOLVED conflicts in index.html.slim
Merge branch 'profile-page' of github.com:Simon245/grasshopper into Simon245-profile-page

RESOLVED conflicts in	app/views/site/index.html.slim
ADDED ngRoute to Grasshopper app
ADDED angular-route to applicaiton.js
ADDED data-current-user-id to store current user id for angular use
RENAMED files
Merge branch 'master' into angular
UPDATED site#index template