refactored 1.1
added 2.1
exercise 2.2