we Firebase now
added most features to DatabaseConnection
Merge branch 'Bill' 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/app.iml
	app/build.gradle
	app/build/generated/source/r/debug/info/androidhive/slidingmenu/R.java
	app/build/intermediates/classes/debug/info/androidhive/slidingmenu/HomeFragment.class
	app/build/intermediates/classes/debug/info/androidhive/slidingmenu/MainActivity$1.class
	app/build/intermediates/classes/debug/info/androidhive/slidingmenu/MainActivity$SlideMenuClickListener.class
	app/build/intermediates/classes/debug/info/androidhive/slidingmenu/MainActivity.class
	app/build/intermediates/classes/debug/info/androidhive/slidingmenu/PhotosFragment.class
	app/build/intermediates/classes/debug/info/androidhive/slidingmenu/R$id.class
	app/build/intermediates/classes/debug/info/androidhive/slidingmenu/R$layout.class
	app/build/intermediates/classes/debug/info/androidhive/slidingmenu/R$menu.class
	app/build/intermediates/classes/debug/info/androidhive/slidingmenu/R$string.class
	app/build/intermediates/classes/debug/info/androidhive/slidingmenu/R$style.class
	app/build/intermediates/classes/debug/info/androidhive/slidingmenu/R.class
	app/build/intermediates/classes/debug/info/androidhive/slidingmenu/adapter/NavDrawerListAdapter.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/support-v4-19.1.0-3d7817301741bfd959e21282beea32f88a8d566e.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/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/outputs/apk/app-debug-unaligned.apk
	app/build/outputs/apk/app-debug.apk
	app/src/main/java/info/androidhive/slidingmenu/HomeFragment.java
	app/src/main/java/info/androidhive/slidingmenu/MainActivity.java
	app/src/main/java/info/androidhive/slidingmenu/PlotFragment.java
	app/src/main/res/layout/fragment_home.xml
	build/intermediates/dex-cache/cache.xml
	build/intermediates/model_data.bin
	local.properties
Put in graph