cosmetic fixes
assignment 4
assignment4
added copyright notice
Merge remote-tracking branch 'upstream/master'
merge with hw4