Initial commit from local git
Merge branch 'master' of github.com:StratAguilar/CPSC_411