Add content

Still have the bug
index title

added title
Merge from master

Manually resolved conflict.
Index content 2

Added additional content.