Revert "123"

This reverts commit 07f3c146fea2a23c94d877cd4dcf05a9a8c300c2.
Merge branch 'master' of https://github.com/yingdeng87/Tariyaki

Conflicts:
	signup.php
asd