made changes to awesomepage.md in small conflcit branch
made changes to master branch awesomepage.md
Merge branch 'small-conflict'

Conflicts:
	awesome_page.md