styles on new titles fixed, merge conflicts on comments fixed
Merge branch 'master' of https://github.com/devcongress/devcongress.com