New Rails application
Merge branch 'master' of github.com:mohitsethi/rails-example-app

Conflicts:
	.gitignore