test development with rails 4
merge