Merge pull request #6 from eas604/master

Pulling for week 2