add users views incomplete
cucumber
working on css
lowercased routes
added some partials
some routes
routes merge
Merge branch 'master' of github.com:Silenthillnight/cs169
some tests
some stuff
routes
Homepage-Ver1.0
Merge branch 'master' of github.com:Silenthillnight/cs169
2nd merge conflict
merge
Homepage-Ver1.1
1. Added delete and edit functions to the Admin Page  2. Changed method of getOneSection route from GET to POST (sorry Seth!)
add user and link to profile
stubbing conflict with home with fixed
conflict in routes resolve