Merge branch 'master' of https://github.com/altenide/mockblog.git
Merge branch 'master' of https://github.com/altenide/mockblog.git