building the JS classes
solving conflicts
Merge branch 'master' of github.com:michaelmuse/twendy