aa
Merge branch 'master' of https://github.com/rickchew/tms

Conflicts:
	application/views/includes/footer.php