23:
Merge branch 'master' of https://github.com/Thainq/lottery

Conflicts:
	FirstApp/FirstApp/SettingsViewController.m
00: