ASDI - 2nd Commit

Got most functions working with javascript
Merge pull request #1 from michellegoldman/master

ASDI - 2nd Commit