simple blog v0.1
test branch
master test branch
conflict fixed
130321 edit master's setting.py