added all to master
added gitignore