staged things for the red spaceship
added the spaceship draw code
changed gitignore
Some changes for red spaceship--prelim work
Trying to stop torrent of Eclipse files
Finished implementing basic functionality of red spaceship
Eclipse
Merge branch 'red_spaceship' into HEAD

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.cdt.ui/space_invaders.build.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/SpaceInvaderTestHW2_hw_platform/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/SpaceInvaderTestHW2_hw_platform/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/space_invaders/.indexes/33/e4/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/space_invaders/.indexes/33/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/space_invaders/.indexes/e4/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/space_invaders/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/space_invaders/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/space_invaders_bsp_0/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/space_invaders_bsp_0/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.cdt.managedbuilder.core.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs
	space_invaders/Debug/space_invaders.elf
	space_invaders/Debug/space_invaders.elf.size
	space_invaders/Debug/src/bitmaps.o
	space_invaders/Debug/src/display.o
	space_invaders/Debug/src/gameplay.o
	space_invaders/Debug/src/input.o
	space_invaders/Debug/src/interrupts.o
	space_invaders/Debug/src/movement.o
	space_invaders/Debug/src/space_invaders.o
	space_invaders/Debug/src/utils.o
	space_invaders/src/display.c
	space_invaders/src/gameplay.c
	space_invaders/src/movement.h
	space_invaders/src/space_invaders.c
	space_invaders/src/space_invaders.h
Removed mergetool annotations