added gitignore
changed sth
Merge remote-tracking branch 'origin/master'

Conflicts:
	build_ballgame_vc12x/BallGame_vc12x.pickle
	build_ballgame_vc12x/BallGame_vc12x.sdf
	build_ballgame_vc12x/BallGame_vc12x.v12.suo
	build_ballgame_vc12x/BallGame_vc12x.vcxproj
	build_ballgame_vc12x/BallGame_vc12x.vcxproj.bak
	build_ballgame_vc12x/BallGame_vc12x.vcxproj.orig
	build_ballgame_vc12x/deploy_config.py
	build_ballgame_vc12x/deploy_config.pyc
	project_BallGame/android (default).config
	project_BallGame/iphone (default).config
	project_BallGame/project.config
	project_BallGame/wp8 (default).config
	project_BallGame/ws80 (default).config
	project_BallGame/ws81 (default).config
Merged.