Fixed bug where something blahaldhf;ladsfadsf
Merge branch 'master' of github.com:sanjaypoyzer/FunkJamTracker