Conditionals Assignment commit 7