test
done with collection view
fix
merge fix
Big merge
Mainstoryboard
Nu funkar storyboard
Merge branch 'master' into Emily