edit lipsum
Merge branch 'test' of https://github.com/somimar/sample into test

Conflicts:
test/Lorem ipsum
conflict resolve