completed skipping test 3 and 14, not catching and just skipping completely
Merge branch 'master' of github.com:DAC098/CSCI-21-SPRING-2014
updated makefile
Merge pc15.cpp