Merge pull request #10 from tHoki/hoki

adding the 6th list item
adding the 7th list item
adding the 7th list item and fixing merge conflicts
adding the 8th list item
adding the 7th list item