Merge pull request #31 from CS3141-Fall2013/master

Update Dev
Merge pull request #32 from aweidner/master

Killfeed is now working
In the middle of trying to get the kd scoreboard stuff to work
going to take a break because running into weird blacken issues