merging confluence
updating .gitignore to include apple DS store files
updating gitignore