Added views folder
Merge branch 'brian'