Merge pull request #10 from Jbtyson/Units

Merging Units into Master
Merge pull request #11 from Jbtyson/Units

Merging Units into Master
fixing conflict in unit.js
Merge pull request #13 from Jbtyson/master

Merging Master into Units