small change to navbar and created a div container for pages
fixed merge errors
fixed merge errors
Merge pull request #6 from dyoachim/users

Users
edited readME. needs more work