I can't remember what I was doing with this branch.
Edited forms
Merge branch 'master' into css_fixes2

Conflicts:
	app/views/articles/show.html.erb
New left column sections.
Finished CSS changes
Fixed indentation inconsistencies in global.css
Merge branch 'master' into css_fixes2

Conflicts:
	app/views/layouts/application.html.erb