format the data
Merge branch 'master' of https://github.com/Volvox/peace-opps
fix christinas popover test