cailbrate scholar
Merge branch 'master' of github.com:ywatase/dot

Conflicts:
	README.md