create small-conflict and edit awesome_page with new line
conflict resolved awesome_page.md
Merge pull request #3 from felix-starman/small-conflict

create small-conflict and edit awesome_page with new line