attr_accessor
Merge branch 'second_branch'