All coding for site
Merge branch 'master' of https://github.com/Stubbs94/JoelStubbs