Merge remote-tracking branch 'origin/soundtrack' into Units
Merge start_end with Units
Merge resources with Units
Merge remote-tracking branch 'origin/Units' into resources
added PlayerResource prototype
added mineralMine obj
added factionResource obj
integrated new resource system into gui and faction
Merge branch 'resources' of github.com:Jbtyson/cis580-rts into buildings