routine morning commit
Merge branch 'master' of https://github.com/sf-wdi-14/notes
blogs.md update with Joe M blog URL
Fix merge conflict
Merge pull request #29 from 2jomcd/master

joem blog.url is in blog.md file