styled the guest's comments on the list
fixed merge conflict
Merge branch 'master' of https://github.com/mseckington/battlehack2014