Commit for safety so I can play with JS
Merge branch 'master' of github.com:peggy-li/hackblue