aspencer8111/mywiki — pull request #18 by aspencer8111 (2014-11-19 21:46:05+00:00)
Title: fix font-styles merge conflict

fix minor merge conflict