small change to navbar and created a div container for pages
fixed merge errors
fixed merge errors
edited readME. needs more work
Merge pull request #8 from dyoachim/users

Users