Creating a conflict
Merge pull request #1 from kevlaria/master

I want to create a conflict!