complete in class assignment
Merge branch 'inClass'