fix merge
Merge branch 'master' of https://github.com/berryny/jsapp