updates
updates to .gitignore
updates
Merge branch 'master' into develop
updates
Merge pull request #11 from jmmaloney4/develop

Develop