Images show up in the buttons.
Merge branch 'master' of github.com:shivakilaru/sodapop

Conflicts:
	SodaPop/ChoiceViewController.m
Merge branch 'master' of github.com:shivakilaru/sodapop