initial
Merge branch 'master' of https://github.com/elactic/private_railsTesting

Conflicts:
	.gitignore