Monday work
Merge branch 'develop'
Tuesday work
Merge branch 'develop' of github.com:dreamfactorysoftware/oasys-examples
Added gitignore
gitignore fix
gitignore fix again
Merge branch 'develop'
Merge branch 'master' of github.com:dreamfactorysoftware/oasys-examples
not sure
Merge branch 'develop' of https://github.com/dreamfactorysoftware/oasys-examples into develop