Ny af alting
Merge remote-tracking branch 'origin/master'

Conflicts:
	HTML5Application/public_html/Main_css.css