removed main max-width
added logo section to nav
Merge branch 'develop' into responsive

Conflicts:
	assets/css/style.css
minor fix