Gitignore update
Textures erbij
Merge branch 'Basic_game_functionality'
Merge fix