Merge pull request #7 from Jbtyson/master

Merging changes in master into resources.
added mining variables to unit.js
resolving conflict in unit.js
fixed MineralMine coordinates to be in center of mine
Got units to recognize when a mine is targeted
refactored resource under faction
supply is decreased when unit dies
supply tracked on all units
Add the building function for villager
Working on implementing mining paths
Revert "Working on implementing mining paths"

This reverts commit 222f7e1139db06dc1a1743285a93ec46d4e4c60f.
added get hitbox to MineralMine
Added separate sprites for units
Implemented new sprites into each unit
i'm committing
Merge branch 'master' of http://github.com/Jbtyson/cis580-rts into ai

Conflicts:
	rts/src/rts.js
fuck git
working on merging
fixed Pathfinding...for realz this time
Still working on merging