Adding changes to my branch
Updated all views.
Removed conflicts
Resolved last conflict.  Trying to merge with master.
Merge pull request #5 from empowerchris/chris

Chris