v1.0
some changes
Merge branch 'v1'

Conflicts:
	hackDukeElon/.settings/org.eclipse.jdt.core.prefs
	hackDukeElon/AndroidManifest.xml
	hackDukeElon/bin/AndroidManifest.xml
	hackDukeElon/bin/R.txt
	hackDukeElon/bin/classes.dex
	hackDukeElon/bin/classes/com/netcompss/ffmpeg4android/R$id.class
	hackDukeElon/bin/classes/com/netcompss/ffmpeg4android/R$layout.class
	hackDukeElon/bin/classes/edu/elon/hackdukeelon/Clip.class
	hackDukeElon/bin/classes/edu/elon/hackdukeelon/MainActivity$1.class
	hackDukeElon/bin/classes/edu/elon/hackdukeelon/MainActivity$2.class
	hackDukeElon/bin/classes/edu/elon/hackdukeelon/MainActivity$3.class
	hackDukeElon/bin/classes/edu/elon/hackdukeelon/MainActivity$4.class
	hackDukeElon/bin/classes/edu/elon/hackdukeelon/MainActivity$5.class
	hackDukeElon/bin/classes/edu/elon/hackdukeelon/MainActivity$6.class
	hackDukeElon/bin/classes/edu/elon/hackdukeelon/MainActivity$7.class

hackDukeElon/bin/classes/edu/elon/hackdukeelon/MainActivity$ColorAdapter
.class
	hackDukeElon/bin/classes/edu/elon/hackdukeelon/MainActivity.class
	hackDukeElon/bin/classes/edu/elon/hackdukeelon/R$id.class
	hackDukeElon/bin/classes/edu/elon/hackdukeelon/R$layout.class
	hackDukeElon/bin/classes/edu/elon/hackdukeelon/R$menu.class
	hackDukeElon/bin/classes/edu/elon/hackdukeelon/R$raw.class
	hackDukeElon/bin/classes/edu/elon/hackdukeelon/R$string.class
	hackDukeElon/bin/classes/edu/elon/hackdukeelon/R$style.class

hackDukeElon/bin/dexedLibs/android-support-v4-97ca5825d5fa0f1d6ba74f6faa
0225c7.jar

hackDukeElon/bin/dexedLibs/ffmpeg4android-b416f705aadd646c1166a87f7339e3
ae.jar
	hackDukeElon/bin/hackDukeElon.apk
	hackDukeElon/bin/resources.ap_
	hackDukeElon/gen/com/netcompss/ffmpeg4android/R.java
	hackDukeElon/gen/edu/elon/hackdukeelon/R.java
	hackDukeElon/res/layout/activity_main.xml
	hackDukeElon/src/edu/elon/hackdukeelon/Clip.java
	hackDukeElon/src/edu/elon/hackdukeelon/MainActivity.java