working on the javascript stuff
Merge branch 'master' of github.com:ohEmily/flyerpenguin_web