rename bootstrap
mv java files to java/ and commit go files
mv android files to android/
Merge branch 'master' of github.com:yechengxiao/practiseCode

Conflicts:
	java/testCode/.idea/.name
	java/testCode/.idea/compiler.xml
	java/testCode/.idea/copyright/profiles_settings.xml
	java/testCode/.idea/encodings.xml
	java/testCode/.idea/misc.xml
	java/testCode/.idea/modules.xml
	java/testCode/.idea/scopes/scope_settings.xml
	java/testCode/.idea/uiDesigner.xml
	java/testCode/.idea/vcs.xml
	java/testCode/.idea/workspace.xml
upload files