first commit
another commit
Merge branch 'master' of https://github.com/ezowen/HomeCameraViewer

pulling so that i can push