can't figure out how to get correct y position of touch...
fixed touch bugs
changes
merge conflicts
connect touch input to server
Merge remote-tracking branch 'origin/celeration'