Merge pull request #2 from The-Dream-Team/master

Change formatting
Merge branch 'master' of https://github.com/dreamteam69/Tardis-WEB
Update content.php
Move to pag load
Merge pull request #354 from dreamteam69/master

Content