Init
Merge branch 'master' of github.com:astray0924/samsung_2nd_module_java

Conflicts:
	.gitignore