Changed Assignment 2.2 and added Assignment 3.1

2.2 now works with null values.
try to make this one line instead of an if/else block