Second Commit
Merge branch 'master' of https://github.com/c-c-t/cs246