Added modular files
Merge branch 'master' of https://github.com/shannontan94/tbpsite

Conflicts:
	carousel.php
	navbar.php