patron views
merge conflict
Merge pull request #17 from rswansonsc/master

patron views