Learn how to merge conflicts properly ;)
Merge pull request #1 from JustArchi/patch-1

Learn how to merge conflicts properly ;)