Merge branch 'master' of C:\Users\johlewis\RubymineProjects\GIT\blog with conflicts.
Feature: Added the looking up of articles by authors.