Forside og logo og annet krimskrams
hmm noe feil her

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