Merge pull request #13 from AMG-Intro/Developement.Patrick

All fixes on gameplay are done