reorganized code
merged some changes from hacknight
Merge branch 'master' of github.com:mweiss17/SilentDiscoSquad

Conflicts:
	index.php