fixing a critical syncing bug
fixing a tim fixed the super ugly bug with a super ugly hack
Fixed grammatical error
Tim tried to fix the syncing without connecting bug
Merged from heroku