Init, created with rails -T option
Merge branch 'master' of github.com:doun/car4home

Conflicts:
	.gitignore