my first octopress commit
merge fixes