Merge pull request #9 from DevMoore94/master

remerge
consolidation of js

added new features and consolidated old code
Merge pull request #45 from mkowoods/master

consolidate js