init
Merge branch 'master' of github.com:cloud66/rails4-mysql-sample

Conflicts:
	.gitignore