tanagram.js
merge conflicts
Merge pull request #6 from Isaac50/master

tanagram.js