putting this here in lieu of a stash
ignore some temporary files/folder
Merge commit 'bc79a774087aa0b89023fa8ff5fdb08289fdf5ee' into develop