Initial commit
Merge branch 'master' of github.com:taguchik/lineman-sample

Conflicts:
	README.md