updates
Merge branch 'master' of github.com:unknownArtist/midNightJackal
updates
Merge branch 'master' of github.com:unknownArtist/midNightJackal
merge conflicts are fixed