not sure what im doing. Things that should be ignored are showing up as not versioned files, and they are preventing me from doing a pull.
Merge branch 'master' of https://github.com/Pabreetzio/BotWars