chang awesome_page for merge conflict
change awesome page for merge issue
final draft
Merge branch 'master' of https://github.com/lilpaw/phase-0-gps-1