App

Made register, login, logout
Merge branch 'master' into alex

Conflicts:
	app/controllers/articles_controller.rb
	app/views/articles/index.html.erb
Merge pull request #1 from DataPoints/alex

App