trying to pull but getting aborted, only debugging changes made
Merge branch 'master' of https://github.com/lsilverwolf/SoftDesProject