added .gitignore
added entire project
merge .gitignore conflicts