(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
Merge pull request #74 from aconnelly/master

(Styling) Add styling to index view and main view