Updatet .gitignore
Trying to fix merge
Merge branch 'master' of github.com:marteloge/fagkom