Asteroids branch merge

Merging the Asteroids and Collision Detection basic functions.