Merge branch 'master' of heroku.com:cshcsite
Merge branch 'master' of heroku.com:cshcsite
Fixed some urls, templates