Bonus pit complete
Merge branch 'master' of https://github.com/akshayrd/Snowbattle_github_new

Conflicts:

SnowBattle/tags/SnowBattle_working/cocos2dsimplegame.xcodeproj/project.p
bxproj

SnowBattle/tags/SnowBattle_working/cocos2dsimplegame/HelloWorldLayer_Lev
el2.m