routine morning commit
See updated class repo
Merge branch 'master' of https://github.com/sf-wdi-14/notes
Merge branch 'master' of https://github.com/sf-wdi-14/notes
Update blogs.md with my blog
Add Paul's first blog post
blogs.md update with Joe M blog URL
Read Amanda's Blog
Add JS Control Flow Notes
Fix Blog conflict
Fix merge conflict
Merge pull request #29 from 2jomcd/master

joem blog.url is in blog.md file
Fix blog merge conflict
Fix blog conflict again
Merge branch 'master' of https://github.com/sf-wdi-14/notes

Conflicts:
	blogs.md
Merge branch 'master' of https://github.com/sf-wdi-14/notes

Conflicts:
	blogs.md
Merge branch 'master' of https://github.com/sf-wdi-14/notes

Conflicts:
	blogs.md
Remove conflicting text
Add Paul Gaudin's blog
Update blogs.md