Minor changes and added some files to gitignore
Merge branch 'master' of https://github.com/jonatanl/fellesprosjekt