[yanan] add method to undisplay baidu logo
add uservoice to exercise
add uservoice to exercise
[yanan] modify gitignore file and delete idea folder
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.idea/workspace.xml
	200/index.html
[yanan] delete idea again
Merge pull request #4 from gynsolomon/master

several commits