Feedback and shareapp created
Merge branch 'develop' into settingsImplementation

Conflicts:
	Podfile.lock
	Wordme.xcodeproj/project.pbxproj
	Wordme/Wordme-Prefix.pch
Implemented switches
Merge branch 'develop' into settingsImplementation

Conflicts:
	Podfile
	Podfile.lock
	Wordme/Wordme-Prefix.pch
Modified travis.yml
Modified travis.yml
Merge pull request #2 from pepibumur/settingsImplementation

Settings implementation