final merge hopefully
Merge branch 'master' of github.com:LizCira/screen_test
Merge pull request #29 from benticsay/master

final merge hopefully