START jaeho_test project
Fix conflict file
Add .gitignore