22:38

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

Conflicts:
	FirstApp/SearchViewController.m
00:13