should have added this to git a long time ago
Merge branch 'master' of https://github.com/JustinKellogg/JavaGui