few changes
Merge branch 'master' of https://github.com/alyssialui/NCMS

Conflicts:
	COMP3900/.metadata/.log
	COMP3900/.metadata/.plugins/org.eclipse.cdt.core/.log
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.projects/CaptureActivity/.indexes/properties.index
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.projects/CaptureActivity/.markers
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.projects/CaptureActivity/.markers.snap
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.projects/CaptureActivity/org.eclipse.jdt.core/state.dat
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.projects/NCMS/.indexes/a0/d6/properties.index
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.projects/NCMS/.indexes/e4/81/1b/1b/history.index
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.projects/NCMS/.indexes/history.index
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.projects/NCMS/.indexes/properties.index
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.projects/NCMS/.markers
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.projects/NCMS/.markers.snap
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.projects/NCMS/org.eclipse.jdt.core/state.dat
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/org.eclipse.jdt.core/state.dat
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.root/6.tree
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.snap
	COMP3900/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.android.ide.eclipse.adt.prefs
	COMP3900/.metadata/.plugins/org.eclipse.jdt.core/2237921350.index
	COMP3900/.metadata/.plugins/org.eclipse.jdt.core/2402366007.index
	COMP3900/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	COMP3900/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	COMP3900/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	COMP3900/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	COMP3900/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml
	COMP3900/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	COMP3900/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml
	COMP3900/CaptureActivity/bin/captureactivity.jar
	COMP3900/NCMS/AndroidManifest.xml
	COMP3900/NCMS/bin/AndroidManifest.xml
	COMP3900/NCMS/bin/NCMS.apk
	COMP3900/NCMS/bin/classes.dex
	COMP3900/NCMS/bin/classes/com/ncms/ncms/MainActivity.class
	COMP3900/NCMS/bin/dexedLibs/android-support-v4-883ed49efbd49dd014c80e5a2a4f4bcc.jar
	COMP3900/NCMS/bin/dexedLibs/captureactivity-3d7189275f96df90393daa676ccd3bc2.jar
	COMP3900/NCMS/bin/dexedLibs/cordova-2.5.0-cf8242002b47df63479d67e4bcc40054.jar
	COMP3900/NCMS/bin/dexedLibs/core-448b06a86178367f6556b9e276b6a0d6.jar
	COMP3900/NCMS/bin/dexedLibs/google-play-services-f06911dcebf6b0f803cce09a8df595ba.jar
	COMP3900/NCMS/bin/dexedLibs/google-play-services_lib-f322e017a157611ff6af26614bc07d4c.jar
	COMP3900/NCMS/bin/resources.ap_
	COMP3900/NCMS/src/com/ncms/ncms/MainActivity.java
	COMP3900/google-play-services_lib/bin/google-play-services_lib.jar
removed unnecessary imports
added info to mainActivity for phone
Merge branch 'master' of https://github.com/alyssialui/NCMS

Conflicts:
	COMP3900/.metadata/.log
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.projects/CaptureActivity/.markers
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.projects/CaptureActivity/org.eclipse.jdt.core/state.dat
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.projects/NCMS/.indexes/a0/d6/properties.index
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.projects/NCMS/.indexes/properties.index
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.projects/NCMS/.markers
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.projects/NCMS/org.eclipse.jdt.core/state.dat
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/org.eclipse.jdt.core/state.dat
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	COMP3900/.metadata/.plugins/org.eclipse.jdt.core/2237921350.index
	COMP3900/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	COMP3900/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	COMP3900/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	COMP3900/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	COMP3900/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	COMP3900/CaptureActivity/bin/captureactivity.jar
	COMP3900/CaptureActivity/bin/classes/com/google/zxing/client/android/BeepManager.class
	COMP3900/CaptureActivity/bin/classes/com/google/zxing/client/android/CaptureActivity.class
	COMP3900/CaptureActivity/bin/classes/com/google/zxing/client/android/CaptureActivityHandler.class
	COMP3900/CaptureActivity/bin/classes/com/google/zxing/client/android/DecodeHandler.class
	COMP3900/CaptureActivity/bin/classes/com/google/zxing/client/android/HelpActivity.class
	COMP3900/CaptureActivity/bin/classes/com/google/zxing/client/android/R$array.class
	COMP3900/CaptureActivity/bin/classes/com/google/zxing/client/android/R$color.class
	COMP3900/CaptureActivity/bin/classes/com/google/zxing/client/android/R$dimen.class
	COMP3900/CaptureActivity/bin/classes/com/google/zxing/client/android/R$drawable.class
	COMP3900/CaptureActivity/bin/classes/com/google/zxing/client/android/R$id.class
	COMP3900/CaptureActivity/bin/classes/com/google/zxing/client/android/R$layout.class
	COMP3900/CaptureActivity/bin/classes/com/google/zxing/client/android/R$menu.class
	COMP3900/CaptureActivity/bin/classes/com/google/zxing/client/android/R$raw.class
	COMP3900/CaptureActivity/bin/classes/com/google/zxing/client/android/R$string.class
	COMP3900/CaptureActivity/bin/classes/com/google/zxing/client/android/R$xml.class
	COMP3900/CaptureActivity/bin/classes/com/google/zxing/client/android/ViewfinderView.class
	COMP3900/CaptureActivity/bin/classes/com/google/zxing/client/android/book/SearchBookContentsActivity$NetworkTask.class
	COMP3900/CaptureActivity/bin/classes/com/google/zxing/client/android/book/SearchBookContentsActivity.class
	COMP3900/CaptureActivity/bin/classes/com/google/zxing/client/android/book/SearchBookContentsAdapter.class
	COMP3900/CaptureActivity/bin/classes/com/google/zxing/client/android/book/SearchBookContentsListItem.class
	COMP3900/CaptureActivity/bin/classes/com/google/zxing/client/android/encode/EncodeActivity.class
	COMP3900/CaptureActivity/bin/classes/com/google/zxing/client/android/encode/QRCodeEncoder.class
	COMP3900/CaptureActivity/bin/classes/com/google/zxing/client/android/history/HistoryActivity.class
	COMP3900/CaptureActivity/bin/classes/com/google/zxing/client/android/history/HistoryItemAdapter.class
	COMP3900/CaptureActivity/bin/classes/com/google/zxing/client/android/result/AddressBookResultHandler.class
	COMP3900/CaptureActivity/bin/classes/com/google/zxing/client/android/result/CalendarResultHandler.class
	COMP3900/CaptureActivity/bin/classes/com/google/zxing/client/android/result/EmailAddressResultHandler.class
	COMP3900/CaptureActivity/bin/classes/com/google/zxing/client/android/result/GeoResultHandler.class
	COMP3900/CaptureActivity/bin/classes/com/google/zxing/client/android/result/ISBNResultHandler.class
	COMP3900/CaptureActivity/bin/classes/com/google/zxing/client/android/result/ProductResultHandler.class
	COMP3900/CaptureActivity/bin/classes/com/google/zxing/client/android/result/ResultHandler.class
	COMP3900/CaptureActivity/bin/classes/com/google/zxing/client/android/result/SMSResultHandler.class
	COMP3900/CaptureActivity/bin/classes/com/google/zxing/client/android/result/TelResultHandler.class
	COMP3900/CaptureActivity/bin/classes/com/google/zxing/client/android/result/TextResultHandler.class
	COMP3900/CaptureActivity/bin/classes/com/google/zxing/client/android/result/URIResultHandler.class
	COMP3900/CaptureActivity/bin/classes/com/google/zxing/client/android/result/supplement/BookResultInfoRetriever.class
	COMP3900/CaptureActivity/bin/classes/com/google/zxing/client/android/result/supplement/ProductResultInfoRetriever.class
	COMP3900/CaptureActivity/bin/classes/com/google/zxing/client/android/result/supplement/URIResultInfoRetriever.class
	COMP3900/CaptureActivity/bin/classes/com/google/zxing/client/android/share/BookmarkAdapter.class
	COMP3900/CaptureActivity/bin/classes/com/google/zxing/client/android/share/ShareActivity.class
	COMP3900/NCMS/bin/classes/com/ncms/ncms/GoogleMapActivity.class
	COMP3900/NCMS/bin/classes/com/ncms/ncms/Menu.class
	COMP3900/NCMS/bin/jarlist.cache
	COMP3900/google-play-services_lib/bin/google-play-services_lib.jar