HW1 submission#12

Open

waschbar01 wants to merge 5 commits intomac-comp394:masterfrom

waschbar01:master

Commits on Feb 7, 2018

Merge remote-tracking branch 'refs/remotes/pcantrell/master'
waschbar01
committed