Merge pull request #16 from schoolofma/master

merging
rearrange and update text
Merge pull request #17 from schoolofma/content_

Content merge