init
Merge branch 'master' of https://github.com/crlsndrsjmnz/labs

Conflicts:
	.DS_Store
	Asgn1-VideoUp/.gitignore
	Asgn1-VideoUp/README.md
	Asgn1-VideoUp/build.gradle
	Asgn1-VideoUp/gradle/wrapper/gradle-wrapper.jar
	Asgn1-VideoUp/gradle/wrapper/gradle-wrapper.properties
	Asgn1-VideoUp/gradlew
	Asgn1-VideoUp/gradlew.bat
	Asgn1-VideoUp/lib/mobilecloud.handin-1.0.0.jar
	Asgn1-VideoUp/lib/video.up.test-1.0.0.jar
	Asgn1-VideoUp/src/main/java/logback.xml
	Asgn1-VideoUp/src/main/java/org/magnum/dataup/Application.java
	Asgn1-VideoUp/src/main/java/org/magnum/dataup/AutoGrading.java
	Asgn1-VideoUp/src/main/java/org/magnum/dataup/VideoFileManager.java
	Asgn1-VideoUp/src/main/java/org/magnum/dataup/VideoSvcApi.java
	Asgn1-VideoUp/src/main/java/org/magnum/dataup/model/Video.java
	Asgn1-VideoUp/src/main/java/org/magnum/dataup/model/VideoStatus.java
	Asgn1-VideoUp/src/test/java/org/magnum/dataup/AutoGradingTest.java
	Asgn1-VideoUp/src/test/resources/test.mp4
	Asgn1-VideoUp/src/test/resources/test.mp4.license
	ContentProviderLabContentProvider/bin/ContentProviderLabContentProvider.apk
	iRemember/bin/classes.dex
	iRemember/bin/dexedLibs/android-support-v4-837b27d517ffca32d6524cc47c3c657a.jar
	iRemember/bin/dexedLibs/slf4j-api-1.7.5-d4192362f1d79c764661deed988f0aa0.jar
	iRemember/bin/iRemember.apk
	iRemember/bin/resources.ap_
	iRemember/gen/edu/vanderbilt/mooc/R.java
	iRememberContentProvider/bin/iRememberContentProvider.apk
	iRememberContentProvider/bin/resources.ap_