adding other changes from home computer.
Merge branch 'master' of https://github.com/nemofish999/FlightSim2

Conflicts:
	public/coffeescript/world.coffee