modified some files
Merge branch 'master' of github.com:nabeel-khan-tp/dgs