/After Fixing SPINNER 야매로/
/done bf getting checked/
/Spinner Done/
/Done/
/dealing mergeconflict./
Merge branch 'master' of https://github.com/jkim0/TestProject

Conflicts:
	Emulator/gen/com/example/emulator/R.java