small change
made changes
Merge branch 'small-conflict'

Conflicts:
	awesome_page.md
Merge branch 'master' of github.com:matthewwho/phase-0-gps-1