Added TODO in order to unmerge this branch from master.
Added int x.
Merge pull request #1 from Willard24/feature1

Added int x. Ready for pull.
Added double y.
Added String s.
Added ArrayList arr.
Merge pull request #2 from Willard24/feature1

Added ArrayList and misc.