Buglist fixed
Merge branch 'master' of https://github.com/merqurioit/treinuno