updated content/features/merge.md
updated content/features/
Merge pull request #33 from seven-phases-max/master

Updated content/features/*