Fixed a lot
Merge branch 'master' of https://github.com/SnakyboSchool/Teddy