Move watchr.rb to project root
Modified layout
Merge pull request #7 from terakoya/layout_merge

Layout merge