Added instructions to user manual for sorting requirements. Changed looks of user manual.
Fixed more merge conflicts in NoteTest.java