did some templates
Merge branch 'master' of https://github.com/swedishbotmafia/sample_app into static_pages
merging with master