Added error checking code to test harness
Merge branch 'master' of github.com:cdiss/POP_REU_2014