not working but you know
I can't remember what I was doing with this branch.
Edited forms
added user and admin session logic
Merge branch 'master' into css_fixes2

Conflicts:
	app/views/articles/show.html.erb
shorter pluralize helper
contributing users
Merge branch 'master' into contributingUsers
merge active record issues
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