Conditionals Assignment commit 6