Adding text for small conflict
Adding text for small conflict
Fixing small conflict

Merge branch 'small-conflict'

Conflicts:
	awesome_page.md