header max-width 960
Merge branch 'master' of https://github.com/danielt69/moas_static

Conflicts:
	frontend.css