lets see what happens
deleted stuff
Merge pull request #2 from ErinJoan/creating_conflicts

Creating conflicts