--
Merge https://github.com/DataPoints/Sprint-1
Merge branch 'master' into alex

Conflicts:
	app/controllers/articles_controller.rb
	app/views/articles/index.html.erb