merging hw2 with hw3 skeleton code
adding remaining files from HW3
add new conf of hw3