??
Merge remote-tracking branch 'origin/master'

Conflicts:
	Application/Gilian/bin/Gilian.apk
	Application/Gilian/bin/R.txt
	Application/Gilian/bin/classes.dex

	Application/Gilian/bin/classes/android/support/v7/appcompat/R$bool.class

	Application/Gilian/bin/classes/android/support/v7/appcompat/R$color.class

	Application/Gilian/bin/classes/android/support/v7/appcompat/R$dimen.class
	Application/Gilian/bin/classes/android/support/v7/appcompat/R$id.class

	Application/Gilian/bin/classes/android/support/v7/appcompat/R$integer.class

	Application/Gilian/bin/classes/android/support/v7/appcompat/R$styleable.class
	Application/Gilian/bin/classes/com/gilian/ese/inu/Main.class
	Application/Gilian/bin/classes/com/gilian/ese/inu/R$bool.class
	Application/Gilian/bin/classes/com/gilian/ese/inu/R$color.class
	Application/Gilian/bin/classes/com/gilian/ese/inu/R$dimen.class
	Application/Gilian/bin/classes/com/gilian/ese/inu/R$drawable.class
	Application/Gilian/bin/classes/com/gilian/ese/inu/R$id.class
	Application/Gilian/bin/classes/com/gilian/ese/inu/R$integer.class
	Application/Gilian/bin/classes/com/gilian/ese/inu/R$layout.class
	Application/Gilian/bin/classes/com/gilian/ese/inu/R$menu.class
	Application/Gilian/bin/classes/com/gilian/ese/inu/R$string.class
	Application/Gilian/bin/classes/com/gilian/ese/inu/R$style.class
	Application/Gilian/bin/classes/com/gilian/ese/inu/R$styleable.class
	Application/Gilian/bin/jarlist.cache
	Application/Gilian/bin/resources.ap_
	Application/Gilian/gen/android/support/v7/appcompat/R.java
	Application/Gilian/gen/com/gilian/ese/inu/R.java
아 어려운 기트허브