Merge pull request #3 from gynsolomon/master

[yanan] add Baidu statistic tool to index.html
[longchao] app200index
Merge branch 'master' of https://github.com/fxp/turtle-apps

Conflicts:
	200/index.html
lock lessons
exercise new version
card type problem correct color
teacher version css
add 104
Merge branch 'master' of github.com:fxp/turtle-apps
Done the comb
[yanan] modify gitignore file and delete idea folder
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.idea/workspace.xml
	200/index.html