added folders and files in them because
Merge branch 'master' of github.com:aleksanb/fellesprosjektet