initial commit
Merge branch 'master' of github.com:Poohblah/csci2270-hw1