bug maing
Merge branch 'master' of https://github.com/Bro-Pals/TAG_8