Visit branch features
Resolving Conflict
Resolving Conflict
Merge branch 'master' of https://github.com/leonson/practicum