update
put everything into a namespace
Merge branch 'master' of https://github.com/BrandonAPrice/CGE