setting edit
Merge branch 'gh-pages' of https://github.com/zeligzhou/aponra into gh-pages

Conflicts:
	css/main.css