Merge branch 'navbar'
added carousel image
fixed margin bugs
fixed bøsse margin
Merge branch 'master' into navbar