cleaned up singleton
Merge branch 'master' of https://github.com/PRCSE/JamJar