more problems
Merge branch 'master' of https://github.com/romanarellano/AppAcademy_training