Fixed merge issue

	modified:   objects.js
Removed solution-specific stuff in master
Fixed a few typos