Initial commit
Merge branch 'AddStatus'

Conflicts:
	app/controllers/articles_controller.rb
	db/development.sqlite3
	log/development.log
Some cahnges