navbar
Merge branch 'master' of https://github.com/keremcankaya0/thesmartstayweb

Conflicts:
	.gitignore
	.idea/workspace.xml
	css/styles.css