updates
Merge branch 'master' of github.com:Joshua-Chin/G3