Debugging!!
After Hodges lecture 7-7-14
After Hodges lecture second time 7-7-14
Had to merge because the lab-2 branch was ahead of the master