Merge pull request #1 from roger-kang-mo/master

Everything
Merge pull request #2 from roger-kang-mo/master

Update gemfile.lock
scroll to output
fix merge with coffee file