first
Merge branch 'master' of https://github.com/checkers-labs/rails

Conflicts:
	.gitignore