fixed merge conflict + compass
Merge branch 'master' of https://github.com/GlenKelley/govhack
fixed merge conflict typo
fixed compass layout