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
fixed category links
CSS fixes
Merge branch 'master' into css_fixes3
Fixed CSS problem in article form.
Added create new article to links for logged out user.
Added max width and height to images in articles.
Changed max width to 100 percent.
merged conflicts