Merging personal hw folder to master