WIP: bundle give me an error...
Merge branch 'master' of github.com:ftomassetti/codedryer

Conflicts:
	.gitignore
	README.md