Updated Makefile
Programming challenge 7
Merge pc7 and previous fixes
pc7 Graded 2014.02.19