(feature) add user page services, view and controller
Merge branch 'master' of https://github.com/aconnelly/project
styling to index and main html pages
merge conflicts resolved
main html styling
more styling
Merge branch 'master' of https://github.com/DangerousWrench/project
adjusted generateRecommendations on routes.js to reflect likes format
Merge pull request #74 from aconnelly/master

(Styling) Add styling to index view and main view
Merge pull request #73 from lpappone/master

(feat) modify keyword search
Merge pull request #72 from eave/master

(feat) adjust generateRecommendations on routes.js to reflect correct likes format
debug keyword search
upstream merge
Merge pull request #75 from incrediblesound/master

debug keywordsearch
fix typo