committing so I can revert
.
Remove ignored files
Some iconography changes
Merge branch 'working_version' into max_develop
Gradle problems solved?