Fixed a bug with .gitignore settings
Resolved conflicts, game settings added, .gitignores fixed