.idea folder is for pycharm collaberation
Merge branch 'master' of https://github.com/Antergos/Cnchi
obkey has been moved to the aur, not sure if we want to pick it up so not including it for now
Merge branch 'master' of https://github.com/Antergos/Cnchi
Merge pull request #117 from lots0logs/master

obkey has been moved to the aur, packages.xml our server needs to be updated