Merging
Merge branch 'master' of github.com:bougoue/volpix_src
par vill testa
solved conflicts
solved some mera konflikter