updated parse
Merge branch 'master' of github.com:nelsonr462/video-screen