lalallala
Merge branch 'master' of https://github.com/justinwm/SE-Payment
dfaafjaijdfiafj:w
Merge branch 'master' of https://github.com/justinwm/SE-Payment

Conflicts:
	Conf/config.php