Conditionals Assignment commit 3

working on group 2