initial commit
Merge branch 'master' of github.com:articlemetrics/mysql_rails-cookbook

Conflicts:
	.gitignore