add two variables from eclipse
Merge branch 'temp'

Conflicts:
	git_test_test/git_test/src/git_test/SecClass.java