Merge pull request #14 from ercchy/master

Adding more templates
adding tests for views