REMOVED dumb code
Merge branch 'master' of github.com:josephktcheung/grasshopper into angular
Merge branch 'profile-page' of github.com:Simon245/grasshopper into angular

RESOLVED conflicts in 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