made a different change to awesome-page
deleting file that caused merge conflict
Merge branch 'master' of https://github.com/mtvillwock/phase-0-gps-1