s
h
Merge branch 'master' of https://github.com/Callahan720/LimboProject

Conflicts:
	includes/helpersTempNick.php