Adam - Working to merge local projects...
Revert "Adam - Working to merge local projects..."

This reverts commit 982ecdbf74b61ae5c2c06e182db632f537f7b663.
Revert "Revert "Adam - Working to merge local projects...""

This reverts commit 2ca5558e9aad3d6cee65b5f659cde11edc5b0a21.
Trying to fix local repo
Merge branch 'master' of https://github.com/adamwilhelmi/DAWCS