Finishing touches #2

- Fixed merge sort
- Corrected answers to questions
- Reformatted code