Merge pull request #5 from nairys/master

bug_fix: rewrote todo_test
chore: forgot to commit my changes
chore: merge conflicts with todo_test
Merge pull request #6 from nairys/oli_pizza_code

bug_fix: committing todo_test rewrite