Assignment 3 with Fixes

@toastynerd Here are the fixes from pull #134. Thanks!
@NEWeber That was my mistake. I thought this was another exercise. :) This all looks good and I am going to merge.