edit
Merge branch 'gh-pages' of https://github.com/jaesik84/emperorCattle into gh-pages