kompileringsfix
Merge branch 'master' of github.com:mymlan/Pacman