integrate hw5 changes into repo

merging dev back into master