my changes
Merge branch 'master' of https://github.com/blackrainbowgames/GamesJam

Conflicts:
	SpookyRoom/Assets/Scenes/Game.unity
	SpookyRoom/Assets/Scripts/Ghost.cs
	SpookyRoom/Assets/Scripts/Player.cs
	SpookyRoom/winphone/SpookyRoom/Data/PlayerConnectionConfigFile
	SpookyRoom/winphone/SpookyRoom/Data/mainData
	SpookyRoom/winphone/SpookyRoom/Data/sharedassets0.assets