Merge pull request #7 from Jbtyson/master

Merging changes in master into resources.
added mining variables to unit.js
resolving conflict in unit.js
resolved conflict in unit.js.  kept head(master)