Merge pull request #1 from Willard24/feature1

Added int x. Ready for pull.
Added String s.
Merge branch 'master' into feature1