TDDeX中にできた分
Merge branch 'master' of github.com:zakky-dev/tddex_ruby

Conflicts:
	.gitignore