this is thrill change
this is second thrill
kljlklkljljlkj
Merge branch 'thrill'

Conflicts:
	app/models/article.rb