changed dummy information to not be duplicated
used let blocks
merged master and fixed conflicts
Merge branch 'master' into stub_returns_refactor
Merge pull request #140 from LightningLord/stub_returns_refactor

Stub returns refactor