commit local changes
Merge branch 'master' of https://github.com/b0xobY/octopress into source

Conflicts:
	.gitignore
	Gemfile.lock
	_config.yml
commit own style
fix category problems