Added int x.
Added double y = 3.2
Merge branch 'feature1'