Auth Settings
Merge branch 'master' of ssh://git@github.com/MKBid/MKBid-API.git

Conflicts:
	settings/authorization.php