first commit
Initial commit for CS240
Merge branch 'master' of https://github.com/lazopard/CS240