# The first commit's message is:
Initial addition of the filters,scraper, and icons.
Conflicts:
lib/docs/filters/yii/clean_html.rb
lib/docs/filters/yii/entries.rb
public/docs/docs.json
# This is the 2nd commit message:
Trying to get the code to format to convention.
Git shows code differently than my editor.