First commit
Merge https://github.com/vihanchaudhry/DG-Project-Test