added this line for collision testing
Merge branch 'collision' into dev_1.0

Conflicts:
	TahDoodle/BNRDocument.m