aaa
Merge branch 'master' of https://github.com/octod/octod.github.io

Conflicts:
	css/octod.css
some mods