added .gitignore file to prevent commit conflict bugs