added iteration 3
updating iteration 3
Merge pull request #5 from Auraelius/master

iteration 3