HW 2
Merge remote-tracking branch 'upstream/master'

merging ken's changes
Merged