Settings page
Merge branch 'master' of github.com:shivakilaru/sodapop

Conflicts:
	SodaPop.xcodeproj/project.pbxproj