Search Update
Merge branch 'master' of https://github.com/Jordan-Bortolotti/twx

Conflicts:
	public_html/css/common.php
Merge branch 'master' of https://github.com/Jordan-Bortolotti/twx