welcome page now has article previews
Merge branch 'master' of github.com:ronnieVoice/wikiful

Conflicts:
	app/views/categories/show.html.erb