Settings
Settings
Reclone
Feature completed: settings screen autolayout
Merge branch 'feature/autolayout/settings' into dev

Conflicts:
	miniShows.xcodeproj/project.xcworkspace/xcshareddata/miniShows.xccheckout
	miniShows/Base.lproj/Main.storyboard
Merge branch 'dev' of https://github.com/poolqf/miniShows into dev

Conflicts:
	miniShows/Base.lproj/Main.storyboard