oppdatert css og litt små ting
Merge branch 'master' of https://github.com/Timian/IS-304

Conflicts:
	wp-content/theme/nff/index.php
	wp-content/theme/nff/nbproject/private/private.xml
	wp-content/theme/nff/single.php
	wp-content/theme/nff/style.css