- quick auth
Merge pull request #1 from SDRubyStudyGroup/britt

created an article model view and controller
Merge branch 'gk-users'

Conflicts:
	app/views/layouts/application.html.haml
	config/routes.rb
Merge branch 'master' of github.com:SDRubyStudyGroup/chat_ruby into britt