Minor changes
Asteroids begun
Merge branch 'dev_LA' into dev

Conflicts:
	SpaceSumo/Terra.h