Small Conflict 1
Resolve Awesome Conflict
Merge pull request #3 from Glendalys/small-conflict

Small Conflict 1