User screens
merge
Merge pull request #35 from patriot1burke/master

User screens