merging developdaly's changes
merging in changes to local repo
fixing some indentation
Merge pull request #14 from bbttxu/master

updated JS wasn't merged on pull request #13