made merge conflict
Merge branch 'master' into small-conflict

Conflicts:
	awesome_page.md
Merge branch 'small-conflict'
resolved test-merge-conflict