Updated gitignore
Merge branch 'master' of github.com:Nexcius/ggj-hamar