Integrated bootstrap-sass
Added images to img directory
Replaced compass/reset with normalize.css and used default html5boilerplate stylesheet
Posts 2013-02-12 and 2013-02-13
Directory structure changed for middleman transition
Merge branch 'working' into middleman_test

Conflicts:
	Gemfile
	config.rb
	source/_sass/styles.scss
Starting from scratch with middleman, html5boilerplate, haml (the bitch), and scss
Styles completed; layouts begun in haml
Converted journal entries to haml; added middleman-blog
Added index lists to index.html and /journal/index.html
Added solarized colors
Modified footer & general aesthetic
Added sitemap_index.xml and journal/sitemap.xml
Modified humans.txt, robots.txt
Deleted extra lines of markup/scripting
Added links to footer; fixed footer style
Added images to /index.html
Added error message; final touchups before merge with devel