Newly created project
Merge branch 'master' of github.com:hatarzyna/rorTutorial

Conflicts:
	.gitignore