Updated style and moved menus back to header.
Merge branch 'styling'

Conflicts:
	static/style.css
	templates/index.html
fixed broken link to image
updated style merged with latest
updated style merged with latest
Merge remote-tracking branch 'origin'
Merge pull request #47 from jurej/master

Style update