Fixed Minishock overlapping
Merge branch 'master' of https://github.com/ilanusse/Smiling-Joe