Merge
Dunno

I really don't.
Merge remote-tracking branch 'upstream/master'
Workin' on dem menues

Figured out how to display stats.
Merge remote-tracking branch 'upstream/master'
Did some stuff.

Honestly I can't tell you exactly what's happening here. Some things got
moved and some got edited.
Merge branch 'master' of https://github.com/dranelol/CMPS427
Working on Paper Doll
Update Character Menu

Moved slots to correct position. Added character model viewer to menu.
Inventory

Added inventory class.
Fixing Merge Conflicts 3/25/2014
Inventory Update

Inventory object is integrated with player. Can view inventory items in
the HUD (it just adds the items from hitting 'A' to the inventory).
Merge remote-tracking branch 'upstream/master'
UI Updates

Added equipment list.
UI Updates 2
Update Character UI Script
Update .gitignore

.gitnore now ignores any .unityproj files.
Merge updates, fix conflicts.
Getting Buff update, fix conflicts.
Inventory Load/Save

The keys for equipping items now adds them to the inventory. Inventory
is saved upon application exit and loaded on start.