small changes in positioning of circles
Merge remote-tracking branch 'upstream/master'
redid the checkoverlap function, added more MVC functionality
merging the conflicts

Merge branch 'master' of https://github.com/lu16j/MITx-1 into lu16j-master

Conflicts:
	6.005 Specs/6005specs.js