Google Plus, Steephill.tv.
Merge branch 'development' of https://github.com/smblott-github/justJK into development

Conflicts:
	config.txt