Merge pull request #95 from Northcode/dev-Andreas

Dev andreas
Merge pull request #96 from Northcode/dev-Andreas

worked on settings
Update .gitignore
Merge pull request #98 from Northcode/dev

Dev