added aloha locally
Merge branch 'master' of https://github.com/ohEmily/flyerpenguin_web