Merge pull request #3 from DennyWest/wk04homework

getting stuff to the correct location