Merge pull request #2 from Glendalys/awesome_page.md

Bold Italic Link
Small Conflict 2
Resolve Awesome Conflict