First commit
Merge branch 'master' of https://github.com/franciscocarodiaz/minishows

Conflicts:
	minishows.xcodeproj/project.xcworkspace/xcshareddata/minishows.xccheckout