Merge branch 'dev'
Times are a changin'

- Also, created template
Merge branch 'dev'
Close Encounters of the Book Kind
Merge branch 'master' of github.com:nt3rp/blog into dev