starting userViews
Merge branch 'master' into userViews

Merging master changes so I have those in this branch as I work
getting started on user view and model
working on user views
Merge pull request #7 from ciaventures/userViews

User views