Merge soundtrack music
Add soundtrack music
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 branch 'buildings'

Conflicts:
	rts/src/rts.js
Merge pull request #2 from Jbtyson/resources

Resources
removed unused resource.js and metal.js
Merge branch 'buildings' into resources
Merge branch 'resources' into buildings