init
d
asdfsdf
Merge branch 'master' of
https://github.com/kyungmankim/Capstone-Snapmovie.git

Conflicts:
	SnapMovieV01/AndroidManifest.xml
	SnapMovieV01/bin/AndroidManifest.xml
	SnapMovieV01/res/values/strings.xml
	SnapMovieV01/src/ac/mju/snapmovie/MyCameraSurface.java
	SnapMovieV01/src/ac/mju/snapmovie/ShootVideoActivity.java
	SnapMovieV01/src/ac/mju/snapmovie/VideoActivity.java