Removed navbar
Merge branch 'myWork'

Conflicts:
	views/index.html

Fixed merge conflicts