bug
h
a
merging

Merge branch 'master' of https://github.com/choochootrain/web_template