for merge braches
Merge branch 'master' of https://github.com/gion/movie-maker
Merge branch 'master' of https://github.com/gion/movie-maker
Merge branch 'master' of https://github.com/gion/movie-maker
app/data/demo.json app/scripts/controllers/main.js app/scripts/services/config.js app/styles/main.scss app/views/main.html