Patched hao's merge with developers branch

Should run fine. Current controls are keyboard controls