added new user with password
basic user functionality
added username hyperlink
boring users
fixed form and verification
friendly id
Category seeds added.
Articles working. Started on Updates
added files from project root
Properly removed a file
Merge branch 'master' into categories2
Merge branch 'master' into articlesAndUpdates

Conflicts:
	wiki/config/routes.rb
added ability to create new Update. Also added functionality to show latest update in the Article Show.
got the new Article form to pormpt for Update informtion and create it also.
removed false comment in articles new view. Also modified logic in article controller, new method, to validate both Article and Update objects before saving anything. Was able to clean up the method a little bit.
simplified Article\:new logic using valid mapping
modified Article Edit to remove unneeded variable and unneeded partial view
Merge branch 'master' into articlesAndUpdates
Added RedCarpet markdown rendering method. Added to ApplicationController so it is available to all methods and views.
refactored article update relationship to use accepts_nested_attributes_for macros