pulling robs changes
added gitignore