added lorem ipsum
Merge branch 'dev'