Noticed a wee mistake in my bit, just removed it.
Merge ssh://github.com/darrenburns/TeamProject3 into feature-chat