added chunky's RoR tutorials
changed d.txt in v2 branch
added merge.txt again
deleted d.txt~
added a different merge.txt to master
Merge branch 'master' into v2

Conflicts:
	merge.txt
deleted d.txt~
Merge branch 'v2'
added merge to all branches
resolving conflict