Menu
Merge branch 'master' of https://github.com/zeroexu/tercoWars

Conflicts:
	tercoWars.xcodeproj/project.pbxproj

tercoWars.xcodeproj/project.xcworkspace/xcuserdata/cadukeson.xcuserdatad
/UserInterfaceState.xcuserstate
	tercoWars/HelloWorldLayer.m
	tercoWars/Resources/Images/tercoWars3.pshs
	tercoWars/Resources/Images/tercoWars3_Botones_Naves-hd.png
	tercoWars/Resources/Images/tercoWars3_Botones_Naves-ipadhd.png
	tercoWars/Resources/Images/tercoWars3_Botones_Naves.png