Rails init
Merge branch 'master' of github.com:laurens/lucy

Conflicts:
	.gitignore