Completed Challenge 16, updated Makefile