first commit
Merge https://github.com/BrandonCouts/CGGA-ProShop