url and settings changes
Merge branch 'master' of https://github.com/technomicssolutions/d-camelot
Merge branch 'master' of https://github.com/technomicssolutions/d-camelot
Merge branch 'master' of https://github.com/technomicssolutions/d-camelot
Merge branch 'master' of https://github.com/technomicssolutions/d-camelot
url changes
Merge branch 'master' of https://github.com/technomicssolutions/d-camelot
Merge branch 'master' of https://github.com/technomicssolutions/d-camelot
merged
merge conflict resolved