Removed settings.ini from repo and updated gitignore
Merge branch 'develop' of https://github.com/Bipshark/TDA367 into develop