자동완성

자동완성
Merge remote-tracking branch 'origin/master'

Conflicts:
	ProjectT/bin/ProjectT.apk
	ProjectT/bin/classes.dex
	ProjectT/bin/resources.ap_
	appcompat_v7/bin/android-support-v7-appcompat.jar
Merge branch 'master' of https://github.com/jongber/ProjectT

Conflicts:
	ProjectT/bin/ProjectT.apk
	ProjectT/bin/R.txt
	ProjectT/bin/classes.dex
	ProjectT/bin/classes/android/support/v7/appcompat/R$layout.class
	ProjectT/bin/classes/com/example/projectt/MainActivity.class

	ProjectT/bin/classes/com/example/projectt/NavigationDrawerFragment.class
	ProjectT/bin/classes/com/example/projectt/R$drawable.class
	ProjectT/bin/classes/com/example/projectt/R$id.class
	ProjectT/bin/classes/com/example/projectt/R$layout.class
	ProjectT/bin/classes/com/example/projectt/R$menu.class
	ProjectT/bin/classes/com/example/projectt/R$string.class
	ProjectT/bin/classes/com/example/projectt/R$style.class
	ProjectT/bin/classes/com/example/projectt/R$styleable.class
	ProjectT/bin/jarlist.cache
	ProjectT/bin/resources.ap_
	ProjectT/gen/android/support/v7/appcompat/R.java
	ProjectT/gen/com/example/projectt/R.java
	appcompat_v7/bin/android-support-v7-appcompat.jar