added user and screen
Merge branch 'master' of github.com:mirthbottle/genvest