gitignore changed
Merge branch 'master' of github.com:vildhet/project2