add article
Merge branch 'add_article' of github.com:mysmaily/sports into add_article

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/articles_controller.rb
	app/controllers/page_controller.rb
	app/views/page/index.html.haml