added solutions to some questions
merge conflict