merge
merge
Merge branch 'master' of https://github.com/Polyphechris/PinballRacer

Conflicts:
	PinballRacer/PinballRacer/Game1.cs
Merge branch 'master' of https://github.com/Polyphechris/PinballRacer

Conflicts:
	PinballRacer/PinballRacer/Players/Player.cs
	PinballRacer/PinballRacer/Track/RaceTrack.cs
added world variable for all obstacles