added proper .gitignore
added more files to .gitignore by merging master