fixed lots of bugs
Merge branch 'master' of github.com:TorelTwiddler/JunglePanic