Iteration 1
Finishes project 4
Merge pull request #3 from nyanzebra/project4

Project4