Revert "Cleanup"

This reverts commit 54f1cff04db665f4f2cd2021f0a474e654502da2.
Revert "Added minion moving(very buggy)"

This reverts commit 1758be71fb7b7f12faf5dfeaa74b2018183c44ca.
Merge remote-tracking branch 'upstream/master'

Merge the Fork of Elyotna