implemented atari controller input, and basic interface in c
merged sarah's code for visual display stuff
Merge branch 'master' of https://github.com/jordenh/LaserSharknadoSW into jordenAtariAndVisual
trying to merge
Merge branch 'master' of https://github.com/jordenh/LaserSharknadoSW into jordenAtariAndVisual
storing hello_world with code to put visual, sound, and atari joystick all together - not working btw.
wrote hello_world to include atari controller input
Merge branch 'multi-sound' of https://github.com/jordenh/LaserSharknadoSW into jordenWorkingWithSoundAtariVisual

Conflicts:
	src/main.c
have player moving via atari cnt, and playing sound via fire button.
Merge pull request #2 from jordenh/combineCode

Combine code
Wrote function to convert 24 bit rgb to 16 bit rgb
merge