pretty hefty css edits, upgraded version of octopress
resolve merge conflicts
checkin? i don't know
Merge branch 'redesign'

* redesign:
  checkin? i don't know
  pretty hefty css edits, upgraded version of octopress

Conflicts:
	public/about/index.html
	public/atom.xml
	public/blog/2012/05/21/begin/index.html
	public/blog/2012/05/26/play-listen-repeat-vol-31/index.html
	public/blog/2012/07/08/my-grandfather/index.html
	public/blog/2012/08/29/after-the-fact-gitignore/index.html
	public/blog/2012/11/05/shows/index.html
	public/blog/2013/05/07/using-grunt-contrib-livereload-with-yeomans-grunt-regarde/index.html
	public/blog/2013/05/15/freelancing/index.html
	public/blog/archives/index.html
	public/blog/categories/git/atom.xml
	public/blog/categories/git/index.html
	public/blog/categories/music/atom.xml
	public/blog/categories/music/index.html
	public/blog/categories/web/atom.xml
	public/blog/categories/web/index.html
	public/index.html
	public/sitemap.xml
	public/stylesheets/screen.css
checkin, i guess
updated link colors
updates
big design changes
mobile view
updated favicon
new post, "redesign"
remove extraneous javascript