Merge pull request #58 from blind-squirrel/Sharon

working on routing of user pages
push to merge everything before resetting routes and controllers