resolving merge problem that someone did

asdasd
Merge branch 'master' of https://github.com/gabrielvargas92/TestStandart