-a
Merge branch 'master' of https://github.com/henb/test_rails

Conflicts:
	.gitignore