Scene file fixed - all merged
Merge branch 'master' of github.com:race122/UOP-Gamejam-2014

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/Scenes/DansTest.unity
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/guidmapper
Fixed a couple bugs
Merge branch 'master' of github.com:race122/UOP-Gamejam-2014

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/guidmapper
Merge pull request #7 from floorman/master

Bug fixes, mainly