Merge pull request #25 from Eye-Static/andy

add tray switching
score
fix merge conflicts
Merge pull request #26 from Eye-Static/stephens

Updated files with score function.
fix x-y, problems with tile dragging containment
change all x-y to y-x, add donut board
fix merge conflicts
remove stupid extra server.js
minor tweaks to score