cleaning up
Merge branches 'staging' and 'develop' into staging
Merge branch 'develop' into staging
add HW6
Fixed comments