Add New File
Added cool feature
Sabotaging
Creating Conflict
Merging in the sabotage branch
 adding .gitignore
Merge branch 'master' of https://github.com/jimmyfursman/DoingGitStuff