attempt on pushing with git
Merge branch 'master' of https://github.com/willthewizard/CSC309
try
Merge branch 'gh-pages' of https://github.com/MissCatLady/CSC309 into gh-pages