piece placement progress
merging
Merge branch 'master' of https://github.com/thinkthroughmath/WarmUpGamePrototype
piece placement logic progress
Merge branch 'master' of github.com:thinkthroughmath/WarmUpGamePrototype into pks/drag_drop_scoreing/master

Conflicts:
	Session_1/public_html/js/ScoreComponent.js