after changeing site color
add files
 added all
after update in samba server post
tracking posts
before pulling octopress
Merge branch 'master' of git://github.com/imathis/octopress

Conflicts:
	Gemfile.lock
	_config.yml
before git pull, commited local chenges
Merge branch 'master' of git://github.com/imathis/octopress
First commit after forking