Stuff
added gitignore
davids stuff
davids stuff
merge