zombiepaladin/scrolling-shooter — pull request #29 by matthewmchaney (2012-09-15 02:32:37+00:00)
Title: Merging assignments 1 & 2

This pull request contains almost all the changes made for assignments 1 and 2. I think a few of the assignment 1's were overwritten by the pull from master for assignment 2, since 4 of the merges didn't have an assignment 1, or were missing parts of it. If you notice your powerup isn't included in the update, please get in contact with me and we can get that sorted out. With any luck, GitHub will automate this pull request smoothly.