added .gitignore and merge from master