Første comit fra intellij
Merge branch 'master' of github.com:mariusGundersen/Cibrary
Merge branch 'master' of github.com:mariusGundersen/Cibrary

Conflicts:
	src/main/scala/cibrary/web/CibraryPlan.scala
Merge branch 'master' of github.com:mariusGundersen/Cibrary