ssd
Merge branch 'master' of https://github.com/cisenor1/eclipses.git

Conflicts:
	SpaceGame/src/star/BaddieMaker.java
Finished Lab 5 for java class.