Changes prepping for app deployment
fixed erics merge
Merge branch 'master' of github.com:JustMovd/JustMovdApp