Completed Challenge 25 with included Makefile
"Merge to 2014.04.06"