File changed slightly and updated as result.
Merge branch 'dev' of https://github.com/harrytraynor/PHPCat into dev