Endret litt
Fjernet warning
Merge branch 'gh-pages'