Attempt to commit main activity
Merge branch 'master' of https://github.com/alyssialui/NCMS

Conflicts:
	COMP3900/.metadata/.log
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.projects/CaptureActivity/.markers.snap
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.projects/CaptureActivity/.syncinfo.snap
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.projects/NCMS/.indexes/properties.index
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.projects/NCMS/.markers.snap
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.projects/NCMS/.syncinfo.snap
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.projects/cordovaExample/.markers.snap
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.projects/cordovaExample/.syncinfo.snap
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/.markers.snap
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/.syncinfo.snap
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	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.jdt.core/2237921350.index
	COMP3900/.metadata/.plugins/org.eclipse.jdt.core/2402366007.index
	COMP3900/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps