gitignore
meh
merging
I hope this doesnt screw things up....