committing anything else I may have done since the last commit
Merge branch 'master' of https://github.com/HeroesGrave/Paint.JAVA