not much
Merge branch 'master' of https://github.com/hoorncj/SuperSnakeOnline

Conflicts:

SuperSnakeOnline/bin/classes/com/google/example/games/basegameutils/Game
Helper.class

SuperSnakeOnline/bin/classes/edu/rosehulman/supersnakeonline/Multiplayer
Activity.class

SuperSnakeOnline/bin/classes/edu/rosehulman/supersnakeonline/R$integer.c
lass

SuperSnakeOnline/bin/classes/edu/rosehulman/supersnakeonline/R$raw.class

SuperSnakeOnline/bin/classes/edu/rosehulman/supersnakeonline/SettingsAct
ivity.class