add comment
Merge branch 'zyx', add comment

Conflicts:
	MVCObject.coffee