sdf
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/misc.xml
	.idea/modules.xml
	app/app.iml
	app/build.gradle
	app/src/main/java/com/example/toshiba/myapplication/MainActivity.java
	app/src/main/java/com/example/toshiba/myapplication/NavigationDrawerFragment.java
	app/src/main/res/drawable-hdpi/ic_launcher.png
	app/src/main/res/drawable-mdpi/ic_launcher.png
	app/src/main/res/drawable-xhdpi/ic_launcher.png
	app/src/main/res/drawable-xxhdpi/ic_launcher.png
	app/src/main/res/layout/fragment_main.xml
	app/src/main/res/values/strings.xml
	app/src/main/res/values/styles.xml
sdf
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/example/toshiba/myapplication/NavigationDrawerFragment.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/example/toshiba/myapplication/NavigationDrawerFragment.java