I fought git, and I won..
Merge branch 'master' of github.com:cybershade/CSCMS