updated README, and added some collision functionality
merged README conflicts