Merge pull request #3 from tetianahogg/dev

Our first task