ok
Merge branch 'dev' of github.com:mgriffeth/groupBlog into dev
asd