first commit
Merge https://github.com/knaught/CS211