Adding in updates from this past weekend
Fixing a merge issue
ickky line
Merge branch 'master' of https://github.com/awjudd/blog-topics

Conflicts:
	README.md