added this line for collision testing
dev 1's collision test!
Merge branch 'collision' into dev_1.0

Conflicts:
	TahDoodle/BNRDocument.m
Merge pull request #3 from cgosingtian/dev_1.0

Dev 1.0