default rails project
controller integration tests running
spork guard
Merge https://github.com/wunmike/railstut

Conflicts:
	.gitignore