wutt
Merge branch 'master' of https://github.com/kairusso/Beta_site

Conflicts:
	my.php
merge
Merge branch 'master' of https://github.com/kairusso/Beta_site