hope this works
Merge branch 'master' of github.com:civilivezation/Civilian