Fix conflict on changelog

Author: luizfonseca

doc/CHANGELOG.md

@@ -1,6 +1,7 @@
 ## Catarse 0.1.0 (unreleased) ##
 
 - Create channels on Catarse (http://:channel_name.catarse.me/ or http://catarse.me/channel/:name)
+- Change default font to Lato & Arvo (Instead of Museo and a font folder for Lato) Google Webfont
 - Add jasmine gem to run Javascript tests
 - Add Vagrantfile, allowing collaborators to run catarse inside a VM
 - Add Rails-Dev-Boost gem