rails new project
updated .gitignore
updated README
Merge branch 'master' of github.com:funnythingz/rails-tutorial

Conflicts:
	README.md