Part one
fixed javascript
Merge pull request #1 from bcutrell/feature_one

Feature one