Extract segmented control
Merge branch 'master' of github.com:jaaaaared/battlehack-ios
WIP
Merge branch 'master' of github.com:jaaaaared/battlehack-ios
WIP
Merge branch 'master' of github.com:jaaaaared/battlehack-ios

Conflicts:
	resources/task-icon@2x.png