fixed weird sync issues
Merge branch 'master' of github.com:dbushy727/project_defined