Added questions 2 and 3
Added assignment 2
??? k.
Merge conflict?