added something, modded something
Merge branch 'master' of https://github.com/octod/octod.github.io

Conflicts:
	css/octod.css
	css/octod.styl
	index.html
	index.jade