Counting - added additional screen parameters
Merge branch 'master' of https://github.com/psmagicman/think-global-hack-local
Merge branch 'master' of https://github.com/psmagicman/think-global-hack-local
Counting - added maincontainer within jframe to contain all components
Merge branch 'master' of https://github.com/psmagicman/think-global-hack-local