Updating to javascript
Merge branch 'stage_one' of github.com:rileydustin/cse201 into stage_one