Merge pull request #1489 from duckpuppy/fix-update_style

Reversed update_style copy direction to correctly restore the sass.old/custom files to the new sass/custom folder
Octopress init
Site updated at 2014-04-22 15:36:27 UTC
init
Merge branch 'master' of github.com:Gassa/gassa.github.io into source
Initial commit
Merge branch 'master' of github.com:Gassa/gassa.github.io
Site updated at 2014-04-22 15:41:17 UTC
Site updated at 2014-04-22 17:01:07 UTC
Site updated at 2014-04-22 19:12:27 UTC
Update index.html
Merge branch 'master' of github.com:Gassa/gassa.github.io into source
change config and add pic
Merge branch 'source' of github.com:Gassa/gassa.github.io into source

Conflicts:
	_config.yml
	source/_includes/custom/navigation.html
	source/index.html