Added .gitignore
Merge branch 'master' of git@github.com:megastep/loki_setup