Merge pull request #23 from krauzer/molly

Molly
Merge branch 'master' of github.com:krauzer/fist_of_five_group_project into molly