initial
Merge branch 'master' of git@github.com:zephyrsun/s-camera.git