incomplete 4 failed tests
updated make file
Merge remote-tracking branch 'upstream/master'
Graded 2014.02.10