updated articles
update to ruby 2
merge conflict