articles can now be locked
Articles can be rolled back now
Merge branch 'master' into lockArticles
added Unique validation for Category name
formatted
Merge branch 'master' into rollBack
Edited forms
Merge branch 'master' into css_fixes2

Conflicts:
	app/views/articles/show.html.erb
New left column sections.
Finished CSS changes