Addtion of gitignore
merging master