Fikset layout på inspirasjonssidene
Merge branch 'master' of github.com:matiashf/webprosjekt-gruppe31

Conflicts:
	www/basketball.php
	www/boksing.php
	www/cricket.php
	www/hiphop.php
	www/hockey.php
	www/langrenn.php
	www/loping.php
	www/pilates.php
	www/ski-og-snowboard.php
	www/styrketrening.php
	www/sykling.php
	www/tennis.php
	www/turgaaing.php
	www/yoga.php