create a basic to do list app in rails
Resolving .gitignore conflicts

Conflicts:
	.gitignore