Putting in order, renaming, markdown
Merge remote-tracking branch 'origin/master'