commit me master
Merge branch 'master' of https://github.com/sokolo986/pacman