Hw3

merging homework3 to master