test
Merge branch 'webapp'

Conflicts:
	app/models/article.rb
master test
resolved