playing, botón de crear en top
Merge branch 'master' of github.com:nachovz/RockoliniOS

Conflicts:
	Rockolin/en.lproj/MainStoryboard_iPhone.storyboard