Merge pull request #10 from jackie2jet/master

杨杰的类打地鼠游戏
clear master branch
Merge pull request #12 from jackie2jet/master

杨杰的类似打地鼠游戏
clear master
cd
edd
gg
Merge branch 'master' of https://github.com/Pamakids/PamakidsApps

Conflicts:
	exercises/WhackingTheHead/.actionScriptProperties
	exercises/WhackingTheHead/bin-debug/WhackingTheHead.swf
Merge branch 'dev' of https://github.com/jackie2jet/PamakidsApps

Conflicts:
	.gitignore.gitignore
	DrawingBoard/README.md
	DrawingBoard/src/DrawingBoard-app.xml
	exercises/Demo/src/Demo-app.xml
	exercises/Demo/src/Demo.as
	exercises/Demo/src/assets/default/draw.png
	exercises/Demo/src/assets/default/draw.xml
	exercises/Demo/src/assets/default/home.png
	exercises/Demo/src/assets/default/home.xml