first commit
Merge github.com:vamsikumarg/rails_test

Conflicts:
	.gitignore