added unit health bars
Merge branch 'master' of https://github.com/scotttorgeson/ggj2013

Conflicts:
	HeartGame/Assets/Prefabs/PlaceholderUnits/RegularUnit.prefab
	HeartGame/Library/InspectorExpandedItems.asset
	HeartGame/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	HeartGame/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	HeartGame/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	HeartGame/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	HeartGame/Library/assetDatabase3
	HeartGame/Library/guidmapper
	HeartGame/Library/metadata/72/72a88360f5974ac48968054886c2f0fe
	HeartGame/Library/metadata/88/8882c12f450eba244b48e0bafeb37b1b
added unit health bars
Merge branch 'master' of https://github.com/scotttorgeson/ggj2013

Conflicts:
	HeartGame/HeartGame.userprefs
	HeartGame/Library/assetDatabase3
	HeartGame/Library/guidmapper
health bar for bases
Merge branch 'master' of https://github.com/scotttorgeson/ggj2013

Conflicts:
	HeartGame/Assets/Levels/MainScott.unity
	HeartGame/HeartGame.userprefs
	HeartGame/Library/InspectorExpandedItems.asset
	HeartGame/Library/assetDatabase3