Changed Assignment 2.2 and added Assignment 3.1

2.2 now works with null values.
These series of if statements could probably be more concise. This of ways you can simplify this logic.