add comment
fix conflict
add comment
add appledoc settings
add comment
fix conflict
add comment
add comment
Merge pull request #46 from 0x0c/appledoc_setting

Appledoc setting