commit of what we did last class
merged
merged