homework 4 and 6 only - removed ALL previous commits from this branch
Merge pull request #58 from eschwiet/hw4_6

homework 4 and 6 only