start up
Merge branch 'master' of github.com:freejacque/dvr_app