First complete version
Merge pull request #2 from DoSomething/Sprint45-First_complete_version

First complete version