Merge soundtrack music
Merge buildings to Master
Merge remote-tracking branch 'origin/buildings'
Merge remote-tracking branch 'origin/factioning'
Merge remote-tracking branch 'origin/PathFinding'
Merge Resources
Merge Units to master
Merge remote-tracking branch 'origin/Units' into resources
Buildings now use resources. Can be selected.
Merge branch 'buildings' of github.com:Jbtyson/cis580-rts into buildings

merging master into my building changes
Added my name to the credits.
Fixed Hitbox for Towncenter. Added takeDamage().
Added ability to build units. Added progress bar.

Units can now be built from the towncenter. There is a progress bar to
indicate how much longer is left in the build.
Fixed building units.

Builds correct units.
Merge branch 'master' into buildings

Buildings are now built from resource files. They can be selected, and when selected, they build units.
Merging.
added PlayerResource prototype
Merge branch 'buildings'

Conflicts:
	rts/src/rts.js
added mineralMine obj
added factionResource obj