Merge pull request #45 from mkowoods/master

consolidate js
Merge pull request #10 from DevMoore94/master

Merge pull request #45 from mkowoods/master