template
Merge branch 'master' of github.com:proudplaces/blog-proudplaces