working sync, no diff
Merge branch 'master' of github.com:reanimus/hackatl14-repo