old hosting site suspeneded our account. new webhost.
Merge branch 'master' of https://github.com/sungbae/csci3308_project

Conflicts:
	html/search/ben_search/signup.php
	html/search/ben_search/signup.php~