Mer's changes to the awesome text file
Resolve merge conflicts
Merge pull request #2 from mer8/mersbranch

Mersbranch