Few changes
Merge branch 'master' of https://github.com/scotttorgeson/ggj2013

Conflicts:
	HeartGame/Assembly-UnityScript-firstpass-vs.unityproj
	HeartGame/Assembly-UnityScript-firstpass.unityproj
	HeartGame/HeartGame.userprefs
	HeartGame/Library/assetDatabase3
	HeartGame/Library/guidmapper
	HeartGame/Library/metadata/12/12b13fbd43a374d4782c9fff5149c4bc
	HeartGame/Library/metadata/48/480b2f4ebbe094642a13dc63c3eff1c3
	HeartGame/Library/metadata/b4/b4b582964823f7b45b0361b4f668f6fb
	HeartGame/Library/metadata/b6/b6d34b42987197544973af8fb2954523
More code for player & game defaults
Merge branch 'master' of https://github.com/scotttorgeson/ggj2013

Conflicts:
	HeartGame/Library/InspectorExpandedItems.asset
	HeartGame/Library/assetDatabase3
	HeartGame/Library/guidmapper
	HeartGame/Library/metadata/12/12b13fbd43a374d4782c9fff5149c4bc
	HeartGame/Library/metadata/72/725b62a5c41bf9b49be144fa305b3eeb
	HeartGame/Library/metadata/b6/b6d34b42987197544973af8fb2954523
Got base rotating working - will do UI in morning