Merge in updated controls
Merged in master
Got basic collisions working
merged server into master