for merge
untrack
to untrack
Merge branch 'kwon'

Conflicts:
	MallangMallangMind/bin/classes/com/mallang/mind/R$id.class
	MallangMallangMind/bin/classes/com/mallang/mind/R$layout.class
	MallangMallangMind/bin/classes/com/mallang/mind/R$menu.class
	MallangMallangMind/bin/classes/com/mallang/mind/R$string.class
	MallangMallangMind/bin/classes/com/mallang/mind/R$style.class
	MallangMallangMind/bin/classes/com/mallang/mind/TimerMainActivity.class
	MallangMallangMind/bin/classes/com/mallang/mind/login/InfoRegisterActivity.class
	MallangMallangMind/bin/classes/com/mallang/mind/login/LoginActivity.class
	MallangMallangMind/bin/classes/com/mallang/mind/login/RegisterActivity.class
	MallangMallangMind/bin/jarlist.cache
	MallangMallangMind/gen/com/mallang/mind/R.java