Solving merge conflicts
Merge pull request #113 from lujameva/merge_conflict

Solving merge conflicts