Quick color edit
Merge emote-tracking branch 'mainRepo/master'

Conflicts:
	bin/spaceinvaders/Board.class
	src/spaceinvaders/Board.java
Added image
Merge remote-tracking branch 'upstream/master'
Added background