nothing
added gitignore
added things
Merge branch 'develop' into d/carmody

merging develop and d/carmody