* added lorem
Merge remote-tracking branch 'origin/master'
renamed folder
Merge remote-tracking branch 'origin/master'