MapEvent class and Items class support worked on

Implemented a basic resource block, but still needs to be fed the
resource somehow. Ore is used as a placeholder. Skewed the die roll
results to be based on a roll of 100. Added an acceptance or refusal for
ally. Implemented equip system for items generated by map event (which
just the character class's EquipItem, but I added acceptance or refusal
support).  Items class now has item type so "RemoveItem" should work in
theory.
Misc Changes:
Ally class given maxAllies limit, added a GetObject function so that the
index based removal test will work (It did work by the way, but the
graphics weren't matching). Resource class standarized to list made in
MapEvent. Adjusted ResourceList to reflect this.

Remaining issues:
Not able to add weight bonus to ally since it runs on a list of
GameObjects instead of characters.
Some error above item MapEvent, I'll investigate later.
Fight function - I'll discuss at meeting.
Read the other TODO tasks for more, but those are the main ones.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Assets/Scripts/Char/Resource.cs
	Assets/Scripts/Test.cs
State Machine Skeleton redone + Fixed Resource Err

After my conversation with Javier and the agreed upon UMLs, I
restructured the state class so it followed the design indicated by the
UMLs. However, I am unable to see whether it works because the script
cannot be found when I run it in Unity. I'm not sure how to fix this but
the code is good. There was a conflict error in the Resource class so I
corrected that. I will resume coding the state machine tomorrow,
hopefully the script error can be resolved so testing can start.
Merge pull request #15 from brentspector/master

State Machine Skeleton redone + Fixed Resource Err