new settings
Merge branch 'master' of https://github.com/crosscliq/rystband.com

Conflicts:
	public/index.php