week8 commit
merging branch