added gitignore
Init commit
Merged with stuff from other computer