Some changes
Merge branch 'master' of https://github.com/akshayrd/Snowbattle_github_new

Conflicts:
	SnowBattle/tags/SnowBattle_working/.DS_Store
	SnowBattle/tags/SnowBattle_working/cocos2dsimplegame/HelloWorldLayer.m

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