전
데모 준비용 ㅠ 카드 태그되려고 섹터를 바꿈
태그ID통신/Https통신
마무리!
Merge branch 'master' of
https://github.com/dramatic33/KONAI_NFC_Enterance_Android.git

Conflicts:
	bin/classes/com/example/nfc_enterance_android/ExportActivity.class
	bin/classes/com/example/nfc_enterance_android/ImportActivity.class
	bin/classes/com/example/nfc_enterance_android/NFCDetectActivity.class
	bin/classes/com/example/nfc_enterance_android/NFCGenActivity.class
	bin/classes/com/example/nfc_enterance_android/NFCProcess.class
	res/layout/reg_activity.xml
	res/layout/reg_new_activity.xml
	src/com/example/nfc_enterance_android/ExportActivity.java
	src/com/example/nfc_enterance_android/NFCDelActivity.java
	src/com/example/nfc_enterance_android/NFCDetectActivity.java
	src/com/example/nfc_enterance_android/NFCGenActivity.java
	src/com/example/nfc_enterance_android/NFCProcess.java