merge of Tyler's and Parker's work
Merge branch 'master' of github.com:eaglewyng/Embedded-Space-Invaders