no conflict added
Merge branch 'master' of https://github.com/dkraczkowski/class.js