Commit before merge
Merge branch 'master' of https://github.com/JimVanG/KnightNews_Android

Conflicts:
	.idea/workspace.xml
Fixed bug where the 'error image' wouldn't load when it was passed null