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

Conflicts:
	tercoWars.xcodeproj/project.pbxproj