Merge pull request #2 from izhang1/Michael

Michael
safety commit
Merge branch 'master' of https://github.com/izhang1/cs252lab6
Fixed merge changes
databaseconnection changes
Merge branch 'Michael' of https://github.com/izhang1/cs252lab6 into Michael

Conflicts:
	.gradle/1.12/taskArtifacts/cache.properties.lock
	.gradle/1.12/taskArtifacts/fileHashes.bin
	.gradle/1.12/taskArtifacts/fileSnapshots.bin
	.gradle/1.12/taskArtifacts/outputFileStates.bin
	.gradle/1.12/taskArtifacts/taskArtifacts.bin
	.idea/workspace.xml
	app/build.gradle
	app/build/intermediates/classes/debug/info/androidhive/slidingmenu/HomeFragment.class
	app/build/intermediates/classes/debug/info/androidhive/slidingmenu/MainActivity.class
	app/build/intermediates/classes/debug/info/androidhive/slidingmenu/SimpleXYPlotActivity.class
	app/build/intermediates/classes/debug/info/androidhive/slidingmenu/model/DatabaseConnection$1.class
	app/build/intermediates/classes/debug/info/androidhive/slidingmenu/model/DatabaseConnection$2.class
	app/build/intermediates/classes/debug/info/androidhive/slidingmenu/model/DatabaseConnection$3.class
	app/build/intermediates/classes/debug/info/androidhive/slidingmenu/model/DatabaseConnection$4.class
	app/build/intermediates/classes/debug/info/androidhive/slidingmenu/model/DatabaseConnection.class
	app/build/intermediates/dex/debug/classes.dex
	app/build/intermediates/incremental/mergeAssets/debug/merger.xml
	app/build/intermediates/incremental/mergeResources/debug/merger.xml
	app/build/intermediates/libs/app-debug.ap_
	app/build/intermediates/pre-dexed/debug/androidplot-core-0.6.1-761c7c2576b521cb3af8d1a830261c7682e881c5.jar
	app/build/intermediates/pre-dexed/debug/support-v4-19.1.0-13b1869629381f5af5511f8acb65d7025b91c016.jar
	app/build/intermediates/res/debug/drawable/counter_bg.xml
	app/build/intermediates/res/debug/drawable/list_item_bg_normal.xml
	app/build/intermediates/res/debug/drawable/list_item_bg_pressed.xml
	app/build/intermediates/res/debug/drawable/list_selector.xml
	app/build/intermediates/res/debug/layout/activity_main.xml
	app/build/intermediates/res/debug/layout/drawer_list_item.xml
	app/build/intermediates/res/debug/layout/fragment_community.xml
	app/build/intermediates/res/debug/layout/fragment_find_people.xml
	app/build/intermediates/res/debug/layout/fragment_home.xml
	app/build/intermediates/res/debug/layout/fragment_pages.xml
	app/build/intermediates/res/debug/layout/fragment_photos.xml
	app/build/intermediates/res/debug/layout/fragment_whats_hot.xml
	app/build/intermediates/res/debug/layout/testplot.xml
	app/build/intermediates/res/debug/menu/main.xml
	app/build/intermediates/res/debug/values-sw720dp-land-v13/values.xml
	app/build/intermediates/res/debug/values-v11/values.xml
	app/build/intermediates/res/debug/values-v14/values.xml
	app/build/intermediates/res/debug/values/values.xml
	app/build/intermediates/res/debug/xml/line_point_formatter_with_plf1.xml
	app/build/intermediates/res/debug/xml/line_point_formatter_with_plf2.xml
	app/build/outputs/apk/app-debug-unaligned.apk
	app/build/outputs/apk/app-debug.apk
	build/intermediates/dex-cache/cache.xml
	build/intermediates/model_data.bin