Add awesome on small-conflict branch
Add awesome to master
We combined master and small-conflict
Merge branch 'small-conflict'

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

Conflicts:
	awesome_page.md